diff --git a/source/_changelogs/3.6.0.md b/source/_changelogs/3.6.0.md
new file mode 100644
index 0000000000..7ba8111b4a
--- /dev/null
+++ b/source/_changelogs/3.6.0.md
@@ -0,0 +1,32 @@
+# 3.6.0
+
+*Released 10/31/2019*
+
+**Features:**
+
+- {% url "`testFiles`" configuration#Folders-Files %} now also accepts an Array of glob patterns when specifying what test files to load in configuration. Addresses {% issue 5401 %}.
+
+**Bugfixes:**
+
+- We fixed a regression in {% url "3.5.0" changelog-3-5-0 %} where the maximum size of an HTTP header or body in a stubbed {% url "`cy.route()`" route %} was limited to 8kb causing requests to fail with a 431 HTTP error. Fixes {% issue 5431 %}.
+- We fixed a bug where certain types of uncaught errors originating from the application under test would not route through the {% url "`uncaught:exception`" catalog-of-events#Uncaught-Exceptions %} handler, and thus could not caught and ignored. These errors will also now correctly indicate that they came from application code. Fixes {% issue 987 %}.
+- We fixed a regression in {% url "3.5.0" changelog-3-5-0 %} that would throw an error during `cypress verify` when running as a non-root user on a non-Windows machine. We now always set the `--no-sandbox` flag when verifying in Electron, even when running as a non-root user. Fixes {% issue 5434 %}.
+- We fixed a regression in {% url "3.5.0" changelog-3-5-0 %} where sometimes cookies were not set on the correct URL during a redirect inside of a {% url "`cy.visit()`" visit %} or {% url "`cy.request()`" request %}. Fixes {% issue 5432 %}.
+- We fixed a regression in {% url "3.5.0" changelog-3-5-0 %} causing environment variables containing unicode values to be incorrectly resolved when read via {% url "`Cypress.env()`" env %}. Fixes {% issue 5435 %}.
+- We fixed a regression in {% url "3.5.0" changelog-3-5-0 %} that prevented use of `.click()` or `.type()` inside of an iframe element. Fixes {% issue 5449 %}. Fixes {% issue 5435 %}.
+- We now throw the proper error message when an element cannot be interacted with due to being covered by an element with `position:fixed`. Fixes {% issue 5430 %}.
+- We fixed a regression in {% url "3.5.0" changelog-3-5-0 %} that caused some `click` events to not be sent to the correct elements during `.click()`. Fixes {% issue 5459 %}.
+- We updated `.type()` to properly respect focus selection changes during typing. Fixes {% issue 5456 %}.
+- We fixed a regression in {% url "3.5.0" changelog-3-5-0 %} that caused selected text to be overwritten while typing a modifer key during `.type()`. Fixes {% issue 5439 %}.
+- We now send all the proper events during `.type()` to input elements with type `date`, `time`, and `datetime-local` so that it now behaves as it did prior to {% url "3.5.0" changelog-3-5-0 %}. Fixes {% issue 5476 %}.
+- We now properly render iframe placeholder content when previewing DOM snapshots. Fixes {% issue 5295 %}.
+
+**Misc:**
+
+- We no longer log the default option `{multiple: true}` in the Command Log or the console during {% url "`cy.dblclick()`" dblclick %}. Addresses {% issue 5406 %}.
+- The text color of inactive tabs within the Cypress Chrome browser has been set to white for better readability. Addresses {% issue 1661 %}.
+
+**Dependency Updates**
+
+- Replaced `express-handlebars`  with `squirrelly` to reduce dependency size. Addressed in {% PR 5521 %}.
+- Upgraded `graceful-fs` from `4.2.0` to `4.2.3`. Addressed in {% PR 5497 %}.
diff --git a/source/guides/references/configuration.md b/source/guides/references/configuration.md
index 979cdbd60e..6c4ab7f00f 100644
--- a/source/guides/references/configuration.md
+++ b/source/guides/references/configuration.md
@@ -18,12 +18,10 @@ Option | Default | Description
 ----- | ---- | ----
 `baseUrl` | `null` | URL used as prefix for {% url `cy.visit()` visit %} or {% url `cy.request()` request %} command's URL
 `env` | `{}` | Any values to be set as {% url 'environment variables' environment-variables %}
-`ignoreTestFiles` | `*.hot-update.js` | A String or Array of glob patterns used to ignore test files that would otherwise be shown in your list of tests. Cypress uses `minimatch` with the options: `{dot: true, matchBase: true}`. We suggest using {% url "http://globtester.com" http://globtester.com %} to test what files would match.
 `numTestsKeptInMemory` | `50` | The number of tests for which snapshots and command data are kept in memory. Reduce this number if you are experiencing high memory consumption in your browser during a test run.
 `port` | `null` | Port used to host Cypress. Normally this is a randomly generated port
 `reporter` | `spec` | The {% url 'reporter' reporters %} used during `cypress run`
 `reporterOptions` | `null` | The {% url 'reporter options' reporters#Reporter-Options %} used. Supported options depend on the reporter.
-`testFiles` | `**/*.*` | A String glob pattern of the test files to load
 `watchForFileChanges` | `true` | Whether Cypress will watch and restart tests on test file changes
 
 ## Timeouts
@@ -47,10 +45,12 @@ Option | Default | Description
 ----- | ---- | ----
 `fileServerFolder`    | root project folder    |Path to folder where application files will attempt to be served from
 `fixturesFolder`    | `cypress/fixtures`    | Path to folder containing fixture files (Pass `false` to disable)
+`ignoreTestFiles` | `*.hot-update.js` | A String or Array of glob patterns used to ignore test files that would otherwise be shown in your list of tests. Cypress uses `minimatch` with the options: `{dot: true, matchBase: true}`. We suggest using {% url "http://globtester.com" http://globtester.com %} to test what files would match.
 `integrationFolder` | `cypress/integration` | Path to folder containing integration test files
 `pluginsFile` | `cypress/plugins/index.js` | Path to plugins file. (Pass `false` to disable)
 `screenshotsFolder`     | `cypress/screenshots`     | Path to folder where screenshots will be saved from {% url `cy.screenshot()` screenshot %} command or after a test fails during `cypress run`
 `supportFile` | `cypress/support/index.js` | Path to file to load before test files load. This file is compiled and bundled. (Pass `false` to disable)
+`testFiles` | `**/*.*` | A String or Array of glob patterns of the test files to load
 `videosFolder`     | `cypress/videos`     | Path to folder where videos will be saved during `cypress run`
 
 ## Screenshots
@@ -125,6 +125,10 @@ cypress run --config integrationFolder=tests,fixturesFolder=false
 cypress run --record --config viewportWidth=1280,viewportHeight=720
 ```
 
+```shell
+cypress open --config watchForFileChanges=false,testFiles=["**/*.js","**/*.coffee"]
+```
+
 ## Plugins
 
 As of {% url `1.2.0` changelog#1-2-0 %} you can programmatically modify configuration values using Node code. This enables you to do things like use `fs` and read off configuration values and dynamically change them.