diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index a4111dfee5abb..4b62aa84598b6 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 <!--
   Q. Which branch should I use for my pull request?
-  A. Your best bet is to go for `master`. If you are unsure, ask in the PR, and a Gatsby mantainer will be happy to help :)
+  A. Your best bet is to go for `master`. If you are unsure, ask in the PR, and a Gatsby maintainer will be happy to help :)
 
   Note: We will only accept bug fixes for Gatsby v1. New features should be added to Gatsby v2.
 
diff --git a/docs/blog/2018-11-16-youfit-case-study/index.md b/docs/blog/2018-11-16-youfit-case-study/index.md
index 336b8d880ac8e..5a31f576966e3 100644
--- a/docs/blog/2018-11-16-youfit-case-study/index.md
+++ b/docs/blog/2018-11-16-youfit-case-study/index.md
@@ -7,7 +7,9 @@ tags:
 ---
 
 We talked with Zach Muha, Director of Digital Marketing at [Youfit Health Clubs][youfit-health-clubs], about his experience with Gatsby and why he decided to use it for a website rebuild. Zach is in charge of managing SEO, UX, SEM, display ads, social channels, email marketing, CRM and the Youfit app- not a small job!
-About Youfit Health Clubs
+
+## About Youfit Health Clubs
+
 Youfit Health Clubs are redefining how people approach health by creating an inclusive, affordable gym environment that welcomes everyone. Founded in 2008 by Rick Berks, Youfit has more than 100 locations across 14 states.
 
 As with many websites, Youfit depends on the site to attract new customers. But a slow site led to a 60% bounce rate on the initial page load, which meant Youfit was losing potential customers. When the website was slow or site visitors couldn’t find the gym closest to their location, they lost interest.
diff --git a/docs/docs/add-a-manifest-file.md b/docs/docs/add-a-manifest-file.md
index f0e250995a585..b2182a1689e9b 100644
--- a/docs/docs/add-a-manifest-file.md
+++ b/docs/docs/add-a-manifest-file.md
@@ -8,11 +8,11 @@ But first, what exactly _are_ PWAs?
 
 They are regular websites that take advantage of modern browser functionality to augment the web experience with app-like features and benefits. Check out [Google's overview](https://developers.google.com/web/progressive-web-apps/) of what defines a PWA experience and the [Progressive web apps (PWAs) doc](/docs/progressive-web-app/) to learn how a Gatsby site is a progressive web app.
 
-Inclusion of a web app manifest is one of the three generally accepted [baseline requirements for a PWA](https://alistapart.com/article/yes-that-web-project-should-be-a-pwa#section1).
+The inclusion of a web app manifest is one of the three generally accepted [baseline requirements for a PWA](https://alistapart.com/article/yes-that-web-project-should-be-a-pwa#section1).
 
 Quoting [Google](https://developers.google.com/web/fundamentals/web-app-manifest/):
 
-> The web app manifest is a simple JSON file that tells the browser about your web application and how it should behave when 'installed' on the users mobile device or desktop.
+> The web app manifest is a simple JSON file that tells the browser about your web application and how it should behave when 'installed' on the user's mobile device or desktop.
 
 [Gatsby's manifest plugin](/packages/gatsby-plugin-manifest/) configures Gatsby to create a `manifest.webmanifest` file on every site build.
 
@@ -37,7 +37,9 @@ npm install --save gatsby-plugin-manifest
         start_url: "/",
         background_color: "#6b37bf",
         theme_color: "#6b37bf",
-        display: "minimal-ui",
+        // Enables "Add to Homescreen" prompt and disables browser UI (including back button)
+        // see https://developers.google.com/web/fundamentals/web-app-manifest/#display
+        display: "standalone",
         icon: "src/images/icon.png", // This path is relative to the root of the site.
       },
     },
diff --git a/docs/docs/add-offline-support-with-a-service-worker.md b/docs/docs/add-offline-support-with-a-service-worker.md
index d441fb10314f0..4dcb8d011e568 100644
--- a/docs/docs/add-offline-support-with-a-service-worker.md
+++ b/docs/docs/add-offline-support-with-a-service-worker.md
@@ -7,7 +7,7 @@ If you've run an [audit with Lighthouse](/docs/audit-with-lighthouse/), you may
 1.  You can [add a manifest file](/docs/add-a-manifest-file/). Ensure that the manifest plugin is listed _before_ the offline plugin so that the offline plugin can cache the created `manifest.webmanifest`.
 2.  You can also add offline support, since another requirement for a website to qualify as a PWA is the use of a [service worker](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API). [Gatsby's offline plugin](/packages/gatsby-plugin-offline/) makes a Gatsby site work offline--and makes it more resistant to bad network conditions--by creating a service worker for your site.
 
-### What is a service worker
+### What is a service worker?
 
 A service worker is a script that your browser runs in the background, separate from a web page, opening the door to features that don't need a web page or user interaction. They increase your site availability in spotty connections, and are essential to making a nice user experience.
 
@@ -27,15 +27,15 @@ Add this plugin to your `gatsby-config.js`
 
 ```javascript:title=gatsby-config.js
 {
-    plugins: [
-        {
-            resolve: `gatsby-plugin-manifest`,
-            options: {
-                ...
-            }
-        },
-        'gatsby-plugin-offline'
-    ]
+  plugins: [
+    {
+      resolve: `gatsby-plugin-manifest`,
+      options: {
+        ...
+      }
+    },
+    'gatsby-plugin-offline'
+  ]
 }
 ```
 
@@ -43,6 +43,23 @@ That's all you need to add offline support to your Gatsby site.
 
 Note: Service worker registers only in production builds (`gatsby build`).
 
+### Displaying a message when a service worker updates
+
+To display a custom message once your service worker finds an update, you can use the [`onServiceWorkerUpdateFound`](/docs/browser-apis/#onServiceWorkerUpdateFound) browser API in your `gatsby-browser.js` file. The following code will display a confirm prompt asking the user whether they would like to refresh the page when an update is found:
+
+```javascript:title=gatsby-browser.js
+exports.onServiceWorkerUpdateFound = () => {
+  const answer = window.confirm(
+    `This application has been updated. ` +
+      `Reload to display the latest version?`
+  )
+
+  if (answer === true) {
+    window.reload()
+  }
+}
+```
+
 ## References
 
 - [Service Workers: an Introduction](https://developers.google.com/web/fundamentals/primers/service-workers/)
diff --git a/docs/docs/add-offline-support.md b/docs/docs/add-offline-support.md
deleted file mode 100644
index baa5d3608e3e9..0000000000000
--- a/docs/docs/add-offline-support.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-title: Add offline support
----
-
-If you've run an [audit with Lighthouse](/docs/audit-with-lighthouse/), you may have noticed a lackluster score in the "Progressive Web App" category. Let's address how you can improve that score.
-
-1.  You can [add a manifest file](/docs/add-a-manifest-file/).
-2.  You can also add offline support, since another requirement for a website to qualify as a PWA is the use of a [service worker](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API). A service worker runs in the background, deciding to serve network or cached content based on connectivity, allowing for a seamless, managed offline experience.
-
-[Gatsby's offline plugin](/packages/gatsby-plugin-offline/) makes a Gatsby site work offline--and makes it more resistant to bad network conditions--by creating a service worker for your site.
-
-### Using `gatsby-plugin-offline`
-
-1.  Install the plugin:
-
-```bash
-npm install --save gatsby-plugin-offline
-```
-
-2.  Add the plugin to the `plugins` array in your `gatsby-config.js` file.
-
-```javascript:title=gatsby-config.js
-{
-    plugins: [
-        {
-            resolve: `gatsby-plugin-manifest`,
-            options: {
-                ...
-            }
-        },
-        'gatsby-plugin-offline'
-    ]
-}
-```
-
-That's all you need to get started with service workers with Gatsby.
-
-> 💡 If you are also [adding a manifest file](/docs/add-a-manifest-file/), the manifest plugin should be listed _before_ the offline plugin so that the offline plugin can cache the created `manifest.webmanifest`.
diff --git a/docs/docs/adding-analytics.md b/docs/docs/adding-analytics.md
index f6e8df3f5056d..12769ebb1f330 100644
--- a/docs/docs/adding-analytics.md
+++ b/docs/docs/adding-analytics.md
@@ -30,7 +30,7 @@ You can find this tracking ID later by going to `Admin > Tracking Info > Trackin
 
 Now, it's time to configure Gatsby to send page views to your Google Analytics account.
 
-We are going to use `gatsby-plugin-google-analytics`. For other analytics options (including Google Analytics gtag.js ang Google Tag Manager), check [other Gatsby analytics plugins](#other-gatsby-analytics-plugins).
+We are going to use `gatsby-plugin-google-analytics`. For other analytics options (including Google Analytics gtag.js and Google Tag Manager), check [other Gatsby analytics plugins](#other-gatsby-analytics-plugins).
 
 ```bash
 npm install --save gatsby-plugin-google-analytics
diff --git a/docs/docs/adding-images-fonts-files.md b/docs/docs/adding-images-fonts-files.md
index 7d8a0a179f177..87dd1b99a5134 100644
--- a/docs/docs/adding-images-fonts-files.md
+++ b/docs/docs/adding-images-fonts-files.md
@@ -123,7 +123,7 @@ However, there is an **escape hatch** that you can use to add an asset outside o
 the module system.
 
 If you put a file into the `static` folder, it will **not** be processed by
-Webpack. Instead it will be copied into the public folder untouched. E.g. if you
+Webpack. Instead, it will be copied into the public folder untouched. E.g. if you
 add a file named `sun.jpg` to the static folder, it'll be copied to
 `public/sun.jpg`. To reference assets in the `static` folder, you'll need to
 [import a helper function from `gatsby` named `withPrefix`](/docs/gatsby-link/#prefixed-paths-helper).
diff --git a/docs/docs/adding-markdown-pages.md b/docs/docs/adding-markdown-pages.md
index 0b4b3923e65ff..a4fd1bb9ebe43 100644
--- a/docs/docs/adding-markdown-pages.md
+++ b/docs/docs/adding-markdown-pages.md
@@ -5,7 +5,7 @@ title: Adding Markdown Pages
 Gatsby can use markdown files to create pages in your site.
 You add plugins to read and understand folders with markdown files and from them create pages automatically.
 
-Here's the steps Gatsby follows for making this happen.
+Here are the steps Gatsby follows for making this happen.
 
 1.  Read files into Gatsby from the filesystem
 2.  Transform markdown to HTML and frontmatter to data
diff --git a/docs/docs/adding-tags-and-categories-to-blog-posts.md b/docs/docs/adding-tags-and-categories-to-blog-posts.md
index d4732a2a1a340..63b6332dec59e 100644
--- a/docs/docs/adding-tags-and-categories-to-blog-posts.md
+++ b/docs/docs/adding-tags-and-categories-to-blog-posts.md
@@ -42,7 +42,7 @@ If `gatsby develop` is running, restart it so Gatsby can pick up the new fields.
 
 ## Write a query to get all tags for your posts
 
-Now these fields are available in the data layer. To use field data, query it using `graphql`. All fields are available to query inside `frontmatter`
+Now, these fields are available in the data layer. To use field data, query it using `graphql`. All fields are available to query inside `frontmatter`
 
 Try running in Graph<em>i</em>QL (`localhost:8000/___graphql`) the following query
 
diff --git a/docs/docs/api-proxy.md b/docs/docs/api-proxy.md
index 7e8e7a14dd7a8..09ce4a7e146af 100644
--- a/docs/docs/api-proxy.md
+++ b/docs/docs/api-proxy.md
@@ -26,8 +26,8 @@ the right place in production.
 
 ## Advanced proxying
 
-Sometimes you need more granular/flexible access to the develop server.
-Gatsby exposes the [Express.js](https://expressjs.com/) develop server to your site's `gatsby-config.js` where you
+Sometimes you need more granular/flexible access to the development server.
+Gatsby exposes the [Express.js](https://expressjs.com/) development server to your site's `gatsby-config.js` where you
 can add Express middleware as needed.
 
 ```javascript:title=gatsby-config.js
diff --git a/docs/docs/api-specification.md b/docs/docs/api-specification.md
index d62b640014b4c..dca0a5b55b179 100644
--- a/docs/docs/api-specification.md
+++ b/docs/docs/api-specification.md
@@ -44,7 +44,7 @@ highlighting to code blocks.
 Transformer plugins are decoupled from source plugins. Transformer plugins look
 at the media type of new nodes created by source plugins to decide if they can
 transform it or not. Which means that a markdown transformer plugin can
-transform markdown from any source without any other configuration e.g. from
+transform markdown from any source without any other configuration e.g. from a
 file, a code comment, or external service like Trello which supports markdown
 in some of its data fields.
 
@@ -97,7 +97,7 @@ fin
 Once the initial bootstrap is finished, we start `webpack-dev-server` and an express server for serving files for the development server, and for a production build, we start building the CSS then JavaScript then HTML with webpack.
 
 During these processes there are various extension points where plugins can
-intervene. All major processes have a `onPre` and `onPost` e.g. `onPreBootstrap`
+intervene. All major processes have an `onPre` and `onPost` e.g. `onPreBootstrap`
 and `onPostBootstrap` or `onPreBuild` or `onPostBuild`. During bootstrap,
 plugins can respond at various stages to APIs like `onCreatePages`,
 `onCreateBabelConfig`, and `onSourceNodes`.
@@ -105,7 +105,7 @@ plugins can respond at various stages to APIs like `onCreatePages`,
 At each extension point, Gatsby identifies the plugins which implement the API
 and calls them in serial following their order in the site's `gatsby-config.js`.
 
-In addition to extension APIs in node, plugins can also implement extension APIs
+In addition to extension APIs in a node, plugins can also implement extension APIs
 in the server rendering process and the browser e.g. `onClientEntry` or
 `onRouteUpdate`
 
diff --git a/docs/docs/babel.md b/docs/docs/babel.md
index de043dab5d5c2..12acf4979e8ee 100644
--- a/docs/docs/babel.md
+++ b/docs/docs/babel.md
@@ -8,7 +8,7 @@ support for writing modern JavaScript — while still supporting older browsers.
 ## How to specify which browsers to support
 
 Gatsby supports by default the last two versions of major browsers, IE 9+, as well as
-any browser that still as 1%+ browser share.
+any browser that still has 1%+ browser share.
 
 This means we automatically compile your JavaScript to ensure it works on older browsers.
 We also automatically add polyfills as needed — no more shipping code which mysteriously
@@ -25,7 +25,7 @@ Gatsby ships with a default .babelrc setup that should work for most sites. If y
 to add custom Babel presets or plugins, you can create your own `.babelrc` at the root of your site, import [`babel-preset-gatsby`](https://github.com/gatsbyjs/gatsby/tree/master/packages/babel-preset-gatsby), and overwrite the `target` option.
 
 ```bash
-npm install --save babel-preset-gatsby
+npm install --save-dev babel-preset-gatsby
 ```
 
 ```json5:title=.babelrc
diff --git a/docs/docs/behind-the-scenes-terminology.md b/docs/docs/behind-the-scenes-terminology.md
index becb0455e0de4..d7eb4f0f3a2e5 100644
--- a/docs/docs/behind-the-scenes-terminology.md
+++ b/docs/docs/behind-the-scenes-terminology.md
@@ -43,7 +43,7 @@ It is also used by [gatsby-plugin-netlify](/packages/gatsby-plugin-netlify/?=net
 
 ### jsonName
 
-The logical name for the page's query json result. The name is constructed during [createPage](https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby/src/redux/actions.js#L229) using a kebabHash of page path. E.g. For above page path, it is:
+The logical name for the page's query json result. The name is constructed during [createPage](https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby/src/redux/actions.js#L229) using a kebabHash of page path. E.g. For the above page path, it is:
 
 `blog-2018-07-17-announcing-gatsby-preview-995`
 
diff --git a/docs/docs/building-with-components.md b/docs/docs/building-with-components.md
index 4a039aad0d5c4..87ca2c7f8df3f 100644
--- a/docs/docs/building-with-components.md
+++ b/docs/docs/building-with-components.md
@@ -118,7 +118,7 @@ export const pageQuery = graphql`
 `src/html.jsx` is responsible for everything other than where Gatsby lives in
 the `<body />`.
 
-In this file you can modify the `<head>` metadata, general structure of the
+In this file, you can modify the `<head>` metadata and general structure of the
 document and add external links.
 
 Typically you should omit this from your site as the default html.js file will
diff --git a/docs/docs/caching.md b/docs/docs/caching.md
index b77592aa47765..206cff161d48a 100644
--- a/docs/docs/caching.md
+++ b/docs/docs/caching.md
@@ -24,6 +24,8 @@ JavaScript and CSS files _generated by webpack_ should also be cached forever. L
 
 The `cache-control` header should be `cache-control: public, max-age=31536000,immutable`
 
+The only exception to this is the file `/sw.js`, which needs to be revalidated upon each load to check if a new version of the site is available. This file is generated by `gatsby-plugin-offline` and other service worker plugins, in order to serve content offline. Its `cache-control` header should be `cache-control: public, max-age=0, must-revalidate`
+
 ## Setting up caching on different hosts
 
 How you setup your caching depends on how you host your site. We encourage people to create Gatsby plugins per host to automate the creation of caching headers.
diff --git a/docs/docs/centralizing-your-sites-navigation.md b/docs/docs/centralizing-your-sites-navigation.md
index d56d083a0a5b5..e12ffd176b92b 100644
--- a/docs/docs/centralizing-your-sites-navigation.md
+++ b/docs/docs/centralizing-your-sites-navigation.md
@@ -42,11 +42,11 @@ module.exports = {
 
 ### Viewing the `siteMetadata` in GraphQL
 
-GraphQL can be used to query for information contained in the `siteMetadata` object located in your project's `gatsby-config.js`. In order to test this out you can start the `default-starter-project` in development mode by running `npm run develop`.
+GraphQL can be used to query for information contained in the `siteMetadata` object located in your project's `gatsby-config.js`. In order to test this out, you can start the `default-starter-project` in development mode by running `npm run develop`.
 
 Navigate to `http://localhost:8000/___graphql` in your browser to view the GraphiQL editor, which enables you to test GraphQL queries on the underlying APIs. Using the documentation explorer you can view the current GraphQL schema for your project, which is an invaluable resource during development.
 
-Examining the available types in GraphQL you will notice that you can query `site`. This GraphQL type further returns the `siteMetadata` which needs to be accessed to create the dynamic navigation. At this point it is useful if you know a little GraphQL in order to extract the menu links. If you are unfamiliar with GraphQL, there is some excellent documentation available at GraphQL's official website found [here](https://graphql.org/learn/) tha you can use to brush up on your skills! The query below will return the menu links.
+Examining the available types in GraphQL you will notice that you can query `site`. This GraphQL type further returns the `siteMetadata` which needs to be accessed to create the dynamic navigation. At this point, it is useful if you know a little GraphQL in order to extract the menu links. If you are unfamiliar with GraphQL, there is some excellent documentation available at GraphQL's official website found [here](https://graphql.org/learn/) that you can use to brush up on your skills! The query below will return the menu links.
 
 ```js
 query SiteQuery {
@@ -90,7 +90,7 @@ Perfect! You now have a way of obtaining data from the `gatsby-config.js` file.
 
 ### Pulling data inside the layout component
 
-Inside your project, locate the `src/components` folder and navigate to the `layout.js` file. Within this layout component you should notice a component named `StaticQuery`.
+Inside your project, locate the `src/components` folder and navigate to the `layout.js` file. Within this layout component, you should notice a component named `StaticQuery`.
 
 StaticQuery is a new component introduced in Gatsby V2, which allows you to run GraphQL queries within your components, not just pages. It allows developers to collocate data with their components.
 
@@ -141,7 +141,7 @@ const Layout = ({ children }) => (
 
 With the above changes to your `StaticQuery` component, the `render` property, which accepts a function that takes one argument, now has access to the menu links for use inside the function (as the argument). The last thing that is left to do is to display the site's navigation.
 
-To do this, the header component that is already available in the project seems like it might be a good starting place to display the navigation. Lets pass the `menuLinks` object to this header component like so:
+To do this, the header component that is already available in the project seems like it might be a good starting place to display the navigation. Let's pass the `menuLinks` object to this header component like so:
 
 ```diff:title=src/components/layout.js
 const Layout = ({ children }) => (
diff --git a/docs/docs/create-source-plugin.md b/docs/docs/create-source-plugin.md
index f1ecd055d13e4..2979712ceb4f4 100644
--- a/docs/docs/create-source-plugin.md
+++ b/docs/docs/create-source-plugin.md
@@ -44,7 +44,7 @@ node for the markdown content and set its mediaType as `text/markdown` and the
 various Gatsby markdown transformer plugins will see your node and transform it
 into HTML.
 
-This loose coupling between data source and transformer plugins allow Gatsby
+This loose coupling between the data source and the transformer plugins allow Gatsby
 site builders to quickly assemble complex data transformation pipelines with
 little work on their (and your (the source plugin author)) part.
 
@@ -54,7 +54,7 @@ A source plugin is a normal NPM package. It has a package.json with optional
 dependencies as well as a `gatsby-node.js` where you implement Gatsby's Node.js
 APIs. Gatsby supports node versions back to Node 4 and as it's common to want to
 use more modern Node.js and JavaScript syntax, many plugins write code in a
-`src` directory and compile the code. All plugins maintained in the Gatsby repo
+source directory and compile the code. All plugins maintained in the Gatsby repo
 follow this pattern.
 
 Your `gatsby-node.js` should look something like:
@@ -110,7 +110,7 @@ There are two ways of adding node relationships in Gatsby: (1) transformations (
 
 An example of a transformation relationship is the `gatsby-transformer-remark` plugin, which transforms a parent `fileNode`'s markdown string into a `MarkdownRemark` node. The Remark transformer plugin adds its newly created child node as a child of the parent node using the action `createParentChildLink`. Transformation relationships are used when a new node is _completely_ derived from a single parent node. E.g. the markdown node is derived from the parent `fileNode` and wouldn't ever exist if the parent `fileNode` hadn't been created.
 
-Because all children nodes are derived from their parent, when a parent node is deleted or changed, Gatsby deletes all of the child nodes (and their child nodes, and so on) with the expectation that they'll be recreated again by transformer plugins. This is done to ensure there's not nodes left over that were derived from older versions of data but shouldn't exist any longer.
+Because all children nodes are derived from their parent, when a parent node is deleted or changed, Gatsby deletes all of the child nodes (and their child nodes, and so on) with the expectation that they'll be recreated again by transformer plugins. This is done to ensure there are no nodes left over that were derived from older versions of data but shouldn't exist any longer.
 
 _Creating the transformation relationship_
 
diff --git a/docs/docs/create-transformer-plugin.md b/docs/docs/create-transformer-plugin.md
index 43d4c746fd53d..80b9883163cff 100644
--- a/docs/docs/create-transformer-plugin.md
+++ b/docs/docs/create-transformer-plugin.md
@@ -35,9 +35,9 @@ Information on the purpose of this function can be found in the [API reference](
 
 ## Using the cache
 
-Sometimes transforming properties costs time and resources and in order to avoid recreating these properties at each run you can profit from the global cache mechanism Gatsby provides.
+Sometimes transforming properties costs time and resources. In order to avoid recreating these properties at each run, you can profit from the global cache mechanism Gatsby provides.
 
-Cache keys should at least contain the contentDigest of the concerned. For example the `gatsby-transformer-remark` uses the following cache key for the html node:
+Cache keys should at least contain the contentDigest of the concerned. For example, the `gatsby-transformer-remark` uses the following cache key for the html node:
 
 ```javascript:title=extend-node-type.js
 const htmlCacheKey = node =>
diff --git a/docs/docs/environment-variables.md b/docs/docs/environment-variables.md
index 9d002b096f75b..a47edb02251d9 100644
--- a/docs/docs/environment-variables.md
+++ b/docs/docs/environment-variables.md
@@ -47,6 +47,10 @@ In addition to these Project Environment Variables defined in `.env.*` files, yo
 OS Env Vars. OS Env Vars which are prefixed with `GATSBY_` will become available in
 browser JavaScript.
 
+```shell:title=.env.*
+GATSBY_API_URL=https://dev.example.com/api
+```
+
 #### Server-side Node.js
 
 Gatsby runs several Node.js scripts at build time, notably `gatsby-config.js` and `gatsby-node.js`.
@@ -77,31 +81,47 @@ Now the variables are available on `process.env` as usual.
 
 ## Example
 
-```shell
-# Example .env.development file
+Please note that you shouldn't commit `.env.*` files to your source control and rather use options given by your CD provider (e.g. Netlify with its [build environment variables](https://www.netlify.com/docs/continuous-deployment/#build-environment-variables)).
 
-API_URL=https://dev.example.com/api
+```shell:title=.env.development
+GATSBY_API_URL=https://dev.example.com/api
+API_KEY=927349872349798
 ```
 
-```shell
-# Example .env.production file
-
-API_URL=https://example.com/api
+```shell:title=.env.production
+GATSBY_API_URL=https://example.com/api
+API_KEY=927349872349798
 ```
 
-These variables will be available to your site as `process.env.API_URL`:
+`GATSBY_API_URL` will be available to your site (Client-side and server-side) as `process.env.GATSBY_API_URL`:
 
 ```jsx
-// usage
+// In any front-end code
 render() {
   return (
     <div>
-      <img src={`${process.env.API_URL}/logo.png`} alt="Logo" />
+      <img src={`${process.env.GATSBY_API_URL}/logo.png`} alt="Logo" />
     </div>
   )
 }
 ```
 
+`API_KEY` will be available to your site (Server-side) as `process.env.API_KEY`. If you commit your `.env.*` file containing `API_KEY` to source control it would also be available on the client-side. However we strongly advise against that! You should prefix your variable with `GATSBY_` (as shown above) instead and Gatsby automatically makes it available in the browser context.
+
+```js
+// In any server-side code, e.g. gatsby-config.js
+module.exports = {
+  plugins: [
+    {
+      resolve: `gatsby-source-patronus`,
+      options: {
+        apiKey: process.env.API_KEY,
+      },
+    },
+  ],
+}
+```
+
 ## Reserved Environment Variables:
 
 > You can not override certain environment variables as some are used internally
@@ -121,8 +141,7 @@ For instance. If you would like to add a `staging` environment with a custom Goo
 
 ### Example
 
-```shell
-# .env.staging
+```shell:title=.env.staging
 GA_TRACKING_ID="UA-1234567890"
 API_URL="http://foo.bar"
 ```
diff --git a/docs/docs/node-tracking.md b/docs/docs/node-tracking.md
index 19ce6445790e3..8f4a736ff7430 100644
--- a/docs/docs/node-tracking.md
+++ b/docs/docs/node-tracking.md
@@ -4,7 +4,7 @@ title: Node Tracking
 
 ## Track Nodes
 
-You may see calls to `trackInlineObjectsInRootNode()` and `findRootNodeAncestor()` in some parts of the code. These are both defined in [schema/node-tracking.js](https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby/src/schema/node-tracking.js). Node tracking is the tracking of relationships between a node's object values (not children), and the node's ID. E.g Take, the following node:
+You may see calls to `trackInlineObjectsInRootNode()` and `findRootNodeAncestor()` in some parts of the code. These are both defined in [schema/node-tracking.js](https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby/src/db/node-tracking.js). Node tracking is the tracking of relationships between a node's object values (not children), and the node's ID. E.g Take, the following node:
 
 ```javascript
 let nodeA = {
@@ -22,7 +22,7 @@ let nodeA = {
 }
 ```
 
-Its sub objects are `foo` (value = `{ myfile: "blog/my-blog.md", b: 2}`), and those in the `baz` array (`{ x: 8 }`). Node tracking will track those back to the top level node's ID (`id2` in this case). The [trackInlineObjectsinRootNode()](https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby/src/schema/node-tracking.js#L32) function takes care of this and records those relationships in the [rootNodeMap](https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby/src/schema/node-tracking.js#L9) WeakMap. E.g after calling `trackInlineObjectsInRootNode(nodeA)`, `rootNodeMap` would contain the following records:
+Its sub objects are `foo` (value = `{ myfile: "blog/my-blog.md", b: 2}`), and those in the `baz` array (`{ x: 8 }`). Node tracking will track those back to the top level node's ID (`id2` in this case). The [trackInlineObjectsinRootNode()](https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby/src/db/node-tracking.js#L32) function takes care of this and records those relationships in the [rootNodeMap](https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby/src/db/node-tracking.js#L9) WeakMap. E.g after calling `trackInlineObjectsInRootNode(nodeA)`, `rootNodeMap` would contain the following records:
 
 ```javascript
 // rootNodeMap:
diff --git a/docs/docs/recipes.md b/docs/docs/recipes.md
index fd17786613b21..6b14dd362b33b 100644
--- a/docs/docs/recipes.md
+++ b/docs/docs/recipes.md
@@ -41,7 +41,7 @@ Read the [Gatsby project structure](/docs/gatsby-project-structure/) guide for a
 Starters are boilerplate Gatsby sites maintained officially, or by the community.
 
 - Learn how to use the Gatsby CLI tool to use starters in [tutorial part one](/tutorial/part-one/#using-gatsby-starters)
-- See a list of [official and community starters](/docs/gatsby-starters/)
+- Browse the [Starter Library](/starters/)
 - Check out Gatsby's [official default starter](https://github.com/gatsbyjs/gatsby-starter-default)
 
 ## Creating pages
diff --git a/docs/docs/visual-testing-with-storybook.md b/docs/docs/visual-testing-with-storybook.md
index d3af30c210051..4146e76da15e9 100644
--- a/docs/docs/visual-testing-with-storybook.md
+++ b/docs/docs/visual-testing-with-storybook.md
@@ -7,7 +7,7 @@ Knowing your components look as intended in every permutation is not only a grea
 1. know what components are available to them in a given project and
 2. what props those components accept and what all of the states of that component are.
 
-As your project grows over time having this information available will be invaluable. This is the function of the Storybook library. Storybook is a UI development environment for your UI components. With it, you can visualize different states of your UI components and develop them interactively.
+As your project grows over time having this information available will be invaluable. This is the function of the [Storybook](https://storybook.js.org/) library. Storybook is a UI development environment for your UI components. With it, you can visualize different states of your UI components and develop them interactively.
 
 ## Setting up your environment
 
@@ -26,11 +26,21 @@ sb init
 
 > Note that if you're running a recent version of `npm` (5.2.0+) you can run the following single command instead: `npx -p @storybook/cli sb init`, which is the recommended method by Storybook. This doesn't install the CLI on your machine, thereby ensuring you're always running the latest version of the CLI.
 
-The `sb init` command bootstraps the basic config necessary to run Storybook for a React project. However, since this is for a Gatsby project, you need to update the default Storybook configuration a bit so that you don't get errors when trying to use Gatsby specific components inside of the stories.
+The `sb init` command bootstraps the basic config necessary to run Storybook for a React project. However, since this is for a Gatsby project, you need to update the default Storybook configuration a bit so you don't get errors when trying to use Gatsby specific components inside of the stories.
 
-To update your Storybook config open `.storybook/config.js` and add the following before the `configure` method at the bottom of the file.
+To update your Storybook config open `.storybook/config.js` and modify the content as follows:
 
-```js
+```js:title=.storybook/config.js
+import { configure } from "@storybook/react"
+
+// automatically import all files ending in *.stories.js
+// highlight-next-line
+const req = require.context("../src", true, /.stories.js$/)
+function loadStories() {
+  req.keys().forEach(filename => req(filename))
+}
+
+// highlight-start
 // Gatsby's Link overrides:
 // Gatsby defines a global called ___loader to prevent its method calls from creating console errors you override it here
 global.___loader = {
@@ -45,13 +55,18 @@ global.__PATH_PREFIX__ = ""
 window.___navigate = pathname => {
   action("NavigateTo:")(pathname)
 }
+
+configure(loadStories, module)
+// highlight-end
 ```
 
+> You can remove the `stories` folder from the root of your project, or move it inside you `src` folder
+
 Next make some adjustments to Storybook's default `webpack` configuration so you can transpile Gatsby source files, and to ensure you have the necessary `babel` plugins to transpile Gatsby components.
 
 Create a new file called `webpack.config.js` in the `.storybook` folder created by the Storybook CLI. Then place the following in that file.
 
-```js
+```js:title=.storybook/webpack.config.js
 module.exports = (baseConfig, env, defaultConfig) => {
   // Transpile Gatsby module because Gatsby includes un-transpiled ES6 code.
   defaultConfig.module.rules[0].exclude = [/node_modules\/(?!(gatsby)\/)/]
@@ -86,11 +101,11 @@ Storybook CLI adds this command to your `package.json` for you so you shouldn't
 
 A full guide to writing stories is beyond the scope of this guide, but we'll take a look at creating a story.
 
-First, create the story file. Storybook looks for all files with a `.story.js` extension and loads them into Storybook for you. Generally you will want your stories near where the component is defined, however since this is Gatsby, if you want stories for your pages, you will have to create those files outside of the `pages` directory.
+First, create the story file. Storybook looks for all files with a `.stories.js` extension and loads them into Storybook for you. Generally you will want your stories near where the component is defined, however since this is Gatsby, if you want stories for your pages, you will have to create those files outside of the `pages` directory.
 
 > A good solution is to create a `__stories__` directory next to your `pages` directory and put any page stories in there.
 
-```js:title=src/components/example.story.js
+```jsx:title=src/components/example.stories.js
 import React from "react"
 import { storiesOf } from "@storybook/react"
 
diff --git a/docs/sites.yml b/docs/sites.yml
index f4a4274ced001..0d38bbc2472e7 100644
--- a/docs/sites.yml
+++ b/docs/sites.yml
@@ -1274,10 +1274,10 @@
 - title: LekoArts
   main_url: "https://www.lekoarts.de"
   url: "https://www.lekoarts.de"
-  source_url: "https://github.com/LeKoArts/portfolio"
+  source_url: "https://github.com/LekoArts/portfolio"
   featured: false
   built_by: LekoArts
-  built_by_url: "https://github.com/LeKoArts"
+  built_by_url: "https://github.com/LekoArts"
   description: >-
     Hi, I'm Lennart — a self-taught and passionate graphic/web designer &
     frontend developer based in Darmstadt, Germany. I love it to realize complex
@@ -3733,3 +3733,39 @@
   built_by: Satispay
   built_by_url: https://www.satispay.com
   featured: false
+- title: The Movie Database - Gatsby
+  url: https://tmdb.lekoarts.de
+  main_url: https://tmdb.lekoarts.de
+  source_url: https://github.com/LekoArts/gatsby-source-tmdb-example
+  categories:
+    - Open Source
+    - Entertainment
+    - Gallery
+  featured: false
+  built_by: LekoArts
+  built_by_url: "https://github.com/LekoArts"
+  description: >
+    Source from The Movie Database (TMDb) API (v3) in Gatsby. This example is built with react-spring, React hooks and react-tabs and showcases the gatsby-source-tmdb plugin. It also has some client-only paths and uses gatsby-image.
+- title: LANDR - Creative Tools for Musicians
+  url: https://www.landr.com/en/
+  main_url: https://www.landr.com/en/
+  categories:
+    - Music
+    - Technology
+  featured: false
+  built_by: LANDR
+  built_by_url: "https://github.com/Mixgenius"
+  description: >
+    Marketing website built for LANDR. LANDR is a web application that provides tools for musicians to master their music (using artificial intelligence), collaborate with other musicians, and distribute their music to multiple platforms.
+- title: ClinicJS
+  url: https://clinicjs.org/
+  main_url: https://clinicjs.org/
+  categories:
+    - Performance
+    - Technology
+    - Documentation
+  featured: false
+  built_by: NearForm
+  built_by_url: "https://www.nearform.com/"
+  description: >
+    Tools to help diagnose and pinpoint Node.js performance issues.
diff --git a/docs/starters.yml b/docs/starters.yml
index 416c807e1c438..3cefbbe0d61ec 100644
--- a/docs/starters.yml
+++ b/docs/starters.yml
@@ -1343,7 +1343,7 @@
     - Support for mathematical expressions
     - Support for images
 - url: https://gatsby-starter-ttag.netlify.com/
-  repo: https://github.com/jaredh159/gatsby-starter-ttag
+  repo: https://github.com/ttag-org/gatsby-starter-ttag
   description: Gatsby starter with the minimum required to demonstrate using ttag for precompiled internationalization of strings.
   tags:
     - i18n
@@ -1363,3 +1363,15 @@
     - Local search powered by Lunr
     - Syntax highlighting
     - Images
+- url: https://gatsby-netlify-cms-example.netlify.com/
+  repo: https://github.com/robertcoopercode/gatsby-netlify-cms
+  description: Gatsby starter using Netlify CMS
+  tags:
+    - Netlify CMS
+    - Styling:SCSS
+  features:
+    - Example of a website for a local developer meetup group
+    - NetlifyCMS used for easy data entry
+    - Mobile-friendly design
+    - Styling done with Sass
+    - Gatsby version 2
diff --git a/docs/tutorial/part-eight/index.md b/docs/tutorial/part-eight/index.md
index deceb43d7b0de..4245827364d1b 100644
--- a/docs/tutorial/part-eight/index.md
+++ b/docs/tutorial/part-eight/index.md
@@ -98,7 +98,9 @@ npm install --save gatsby-plugin-manifest
         start_url: "/",
         background_color: "#6b37bf",
         theme_color: "#6b37bf",
-        display: "minimal-ui",
+        // Enables "Add to Homescreen" prompt and disables browser UI (including back button)
+        // see https://developers.google.com/web/fundamentals/web-app-manifest/#display
+        display: "standalone",
         icon: "src/images/icon.png", // This path is relative to the root of the site.
       },
     },
diff --git a/docs/tutorial/part-two/index.md b/docs/tutorial/part-two/index.md
index 0ccd7d897ec18..cec992ae02861 100644
--- a/docs/tutorial/part-two/index.md
+++ b/docs/tutorial/part-two/index.md
@@ -413,14 +413,20 @@ Paste the following into the file:
 }
 ```
 
-Now import that file into the `about-css-modules.js` page you created earlier, by adding the following on lines 2 and 3.
-(The `console.log(styles)` code logs the resulting import so you can see what the processed file looks like).
+Now import that file into the `about-css-modules.js` page you created earlier, by editing the first few lines
+of the file to look like:
 
 ```javascript:title=src/pages/about-css-modules.js
+import React from "react"
+// highlight-next-line
 import styles from "./about-css-modules.module.css"
+import Container from "../components/container"
+
+// highlight-next-line
 console.log(styles)
 ```
 
+The `console.log(styles)` code logs the resulting import so you can see what the processed file looks like.
 If you open the developer console (using e.g. Firefox or Chrome's developer tools) in your browser, you'll see:
 
 ![css-modules-console](css-modules-console.png)
diff --git a/e2e-tests/production-runtime/cypress/integration/prefetching.js b/e2e-tests/production-runtime/cypress/integration/prefetching.js
new file mode 100644
index 0000000000000..cd813310cd5cd
--- /dev/null
+++ b/e2e-tests/production-runtime/cypress/integration/prefetching.js
@@ -0,0 +1,27 @@
+describe(`Prefetching`, () => {
+  if (Cypress.env(`CONNECTION_TYPE`) === `slow`) {
+    it(`should not prefetch if on slow connection`, () => {
+      cy.visit(`/`).waitForAPI(`onRouteUpdate`)
+
+      cy.window().then(win => {
+        const isPrefetching = win.___loader.enqueue(`/page-2`)
+        expect(isPrefetching).to.equal(false)
+      })
+
+      cy.get(`link[rel="prefetch"]`).should(`not.exist`)
+      cy.lifecycleCallCount(`onPrefetchPathname`).should(`equal`, 0)
+    })
+  } else {
+    it(`should prefetch`, () => {
+      cy.visit(`/`).waitForAPI(`onRouteUpdate`)
+
+      cy.window().then(win => {
+        const isPrefetching = win.___loader.enqueue(`/page-2`)
+        expect(isPrefetching).to.equal(true)
+      })
+
+      cy.get(`link[rel="prefetch"]`).should(`exist`)
+      cy.lifecycleCallCount(`onPrefetchPathname`).should(`not.equal`, 0)
+    })
+  }
+})
diff --git a/e2e-tests/production-runtime/cypress/plugins/index.js b/e2e-tests/production-runtime/cypress/plugins/index.js
index fd170fba6912b..871f0fb6a83c5 100644
--- a/e2e-tests/production-runtime/cypress/plugins/index.js
+++ b/e2e-tests/production-runtime/cypress/plugins/index.js
@@ -14,4 +14,17 @@
 module.exports = (on, config) => {
   // `on` is used to hook into various events Cypress emits
   // `config` is the resolved Cypress config
+
+  if (process.env.CYPRESS_CONNECTION_TYPE) {
+    on(`before:browser:launch`, (browser = {}, args) => {
+      if (
+        browser.name === `chrome` &&
+        process.env.CYPRESS_CONNECTION_TYPE === `slow`
+      ) {
+        args.push(`--force-effective-connection-type=2G`)
+      }
+
+      return args
+    })
+  }
 }
diff --git a/e2e-tests/production-runtime/gatsby-browser.js b/e2e-tests/production-runtime/gatsby-browser.js
index f81cf6249d3e9..49618a228a63b 100644
--- a/e2e-tests/production-runtime/gatsby-browser.js
+++ b/e2e-tests/production-runtime/gatsby-browser.js
@@ -18,3 +18,7 @@ exports.onPreRouteUpdate = ({ location }) => {
 exports.onRouteUpdate = ({ location }) => {
   addLogEntry(`onRouteUpdate`, location)
 }
+
+exports.onPrefetchPathname = ({ pathname }) => {
+  addLogEntry(`onPrefetchPathname`, pathname)
+}
diff --git a/e2e-tests/production-runtime/package.json b/e2e-tests/production-runtime/package.json
index 937217f8e0720..19ccb0d841f3d 100644
--- a/e2e-tests/production-runtime/package.json
+++ b/e2e-tests/production-runtime/package.json
@@ -26,7 +26,9 @@
     "start-server-and-test": "start-server-and-test serve http://localhost:9000 cy:run",
     "serve": "gatsby serve",
     "cy:open": "cypress open",
-    "cy:run": "cypress run --browser chrome"
+    "cy:run": "npm run cy:run:normal && npm run cy:run:slow",
+    "cy:run:normal": "cypress run --browser chrome",
+    "cy:run:slow": "CYPRESS_CONNECTION_TYPE=slow cypress run --browser chrome --config testFiles=prefetching.js"
   },
   "devDependencies": {
     "prettier": "^1.14.3",
diff --git a/packages/gatsby-image/CHANGELOG.md b/packages/gatsby-image/CHANGELOG.md
index 78bc97175ad02..91adbf984067f 100644
--- a/packages/gatsby-image/CHANGELOG.md
+++ b/packages/gatsby-image/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="2.0.25"></a>
+
+## [2.0.25](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-image/compare/gatsby-image@2.0.24...gatsby-image@2.0.25) (2018-12-13)
+
+### Bug Fixes
+
+- **gatsby-image:** update typescript definitions - properly mark fields as optional ([#10419](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-image/issues/10419)) ([f2b1821](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-image/commit/f2b1821))
+
+<a name="2.0.24"></a>
+
+## [2.0.24](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-image/compare/gatsby-image@2.0.23...gatsby-image@2.0.24) (2018-12-12)
+
+**Note:** Version bump only for package gatsby-image
+
+<a name="2.0.23"></a>
+
+## [2.0.23](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-image/compare/gatsby-image@2.0.22...gatsby-image@2.0.23) (2018-12-11)
+
+### Features
+
+- **gatsby-image:** add onStartLoad prop ([#6702](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-image/issues/6702)) ([1d25a95](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-image/commit/1d25a95))
+
 <a name="2.0.22"></a>
 
 ## [2.0.22](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-image/compare/gatsby-image@2.0.21...gatsby-image@2.0.22) (2018-11-29)
diff --git a/packages/gatsby-image/index.d.ts b/packages/gatsby-image/index.d.ts
index c2252b03c162b..eaeebbc3e8e55 100644
--- a/packages/gatsby-image/index.d.ts
+++ b/packages/gatsby-image/index.d.ts
@@ -16,10 +16,10 @@ interface FluidObject {
   src: string
   srcSet: string
   sizes: string
-  base64: string
-  tracedSVG: string
-  srcWebp: string
-  srcSetWebp: string
+  base64?: string
+  tracedSVG?: string
+  srcWebp?: string
+  srcSetWebp?: string
 }
 
 interface GatsbyImageProps {
@@ -34,7 +34,7 @@ interface GatsbyImageProps {
   critical?: boolean
   style?: object
   imgStyle?: object
-  placeholderStyle: object
+  placeholderStyle?: object
   backgroundColor?: string | boolean
   onLoad?: () => void
   onStartLoad?: (param: { wasCached: boolean }) => void
diff --git a/packages/gatsby-image/package.json b/packages/gatsby-image/package.json
index 1058f9bd095b8..df4cb3ad7fdc8 100644
--- a/packages/gatsby-image/package.json
+++ b/packages/gatsby-image/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-image",
   "description": "Lazy-loading React image component with optional support for the blur-up effect.",
-  "version": "2.0.22",
+  "version": "2.0.25",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
diff --git a/packages/gatsby-image/src/__tests__/__snapshots__/index.js.snap b/packages/gatsby-image/src/__tests__/__snapshots__/index.js.snap
index acdeda03b9b06..526704fd7850b 100644
--- a/packages/gatsby-image/src/__tests__/__snapshots__/index.js.snap
+++ b/packages/gatsby-image/src/__tests__/__snapshots__/index.js.snap
@@ -10,11 +10,11 @@ exports[`<Img /> should render fixed size images 1`] = `
       alt=""
       class="placeholder"
       src="string_of_base64"
-      style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; opacity: 0; color: red;"
+      style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; opacity: 1; color: red;"
       title="Title for the image"
     />
     <div
-      style="width: 100px; opacity: 0; height: 100px;"
+      style="width: 100px; opacity: 1; height: 100px;"
       title="Title for the image"
     />
     <picture>
@@ -29,7 +29,7 @@ exports[`<Img /> should render fixed size images 1`] = `
         alt="Alt text for the image"
         height="100"
         src="test_image.jpg"
-        style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; opacity: 1;"
+        style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; opacity: 0;"
         title="Title for the image"
         width="100"
       />
@@ -54,11 +54,11 @@ exports[`<Img /> should render fluid images 1`] = `
       alt=""
       class="placeholder"
       src="string_of_base64"
-      style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; opacity: 0; color: red;"
+      style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; opacity: 1; color: red;"
       title="Title for the image"
     />
     <div
-      style="position: absolute; top: 0px; bottom: 0px; opacity: 0; right: 0px; left: 0px;"
+      style="position: absolute; top: 0px; bottom: 0px; opacity: 1; right: 0px; left: 0px;"
       title="Title for the image"
     />
     <picture>
@@ -74,7 +74,7 @@ exports[`<Img /> should render fluid images 1`] = `
       <img
         alt="Alt text for the image"
         src="test_image.jpg"
-        style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; opacity: 1;"
+        style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; opacity: 0;"
         title="Title for the image"
       />
     </picture>
diff --git a/packages/gatsby-image/src/__tests__/index.js b/packages/gatsby-image/src/__tests__/index.js
index c4ac37f1215cb..e6f3a669bdd35 100644
--- a/packages/gatsby-image/src/__tests__/index.js
+++ b/packages/gatsby-image/src/__tests__/index.js
@@ -67,8 +67,9 @@ describe(`<Img />`, () => {
     expect(placeholderImageTag.getAttribute(`title`)).toEqual(
       `Title for the image`
     )
+    // No Intersection Observer in JSDOM, so placeholder img will be visible (opacity 1) by default
     expect(placeholderImageTag.getAttribute(`style`)).toEqual(
-      `position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; opacity: 0; color: red;`
+      `position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; opacity: 1; color: red;`
     )
     expect(placeholderImageTag.getAttribute(`class`)).toEqual(`placeholder`)
   })
diff --git a/packages/gatsby-image/src/index.js b/packages/gatsby-image/src/index.js
index 4686182ca244e..3c2870667a5ec 100644
--- a/packages/gatsby-image/src/index.js
+++ b/packages/gatsby-image/src/index.js
@@ -127,10 +127,9 @@ class Image extends React.Component {
   constructor(props) {
     super(props)
 
-    // If this browser doesn't support the IntersectionObserver API
-    // we default to start downloading the image right away.
+    // default settings for browser without Intersection Observer available
     let isVisible = true
-    let imgLoaded = true
+    let imgLoaded = false
     let IOSupported = false
     let fadeIn = props.fadeIn
 
@@ -138,25 +137,24 @@ class Image extends React.Component {
     // already in the browser cache so it's cheap to just show directly.
     const seenBefore = inImageCache(props)
 
+    // browser with Intersection Observer available
     if (
       !seenBefore &&
       typeof window !== `undefined` &&
       window.IntersectionObserver
     ) {
       isVisible = false
-      imgLoaded = false
       IOSupported = true
     }
 
-    // Always don't render image while server rendering
+    // Never render image during SSR
     if (typeof window === `undefined`) {
       isVisible = false
-      imgLoaded = false
     }
 
+    // Force render for critical images
     if (props.critical) {
       isVisible = true
-      imgLoaded = false
       IOSupported = false
     }
 
diff --git a/packages/gatsby-plugin-manifest/CHANGELOG.md b/packages/gatsby-plugin-manifest/CHANGELOG.md
index edbdd1796c24b..ad10905f22e71 100644
--- a/packages/gatsby-plugin-manifest/CHANGELOG.md
+++ b/packages/gatsby-plugin-manifest/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="2.0.12"></a>
+
+## [2.0.12](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-manifest/compare/gatsby-plugin-manifest@2.0.11...gatsby-plugin-manifest@2.0.12) (2018-12-11)
+
+**Note:** Version bump only for package gatsby-plugin-manifest
+
 <a name="2.0.11"></a>
 
 ## [2.0.11](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-manifest/compare/gatsby-plugin-manifest@2.0.10...gatsby-plugin-manifest@2.0.11) (2018-11-29)
diff --git a/packages/gatsby-plugin-manifest/README.md b/packages/gatsby-plugin-manifest/README.md
index a526d42a739a7..b1693b6094849 100644
--- a/packages/gatsby-plugin-manifest/README.md
+++ b/packages/gatsby-plugin-manifest/README.md
@@ -46,7 +46,9 @@ module.exports = {
         start_url: `/`,
         background_color: `#f7f0eb`,
         theme_color: `#a2466c`,
-        display: `minimal-ui`,
+        // Enables "Add to Homescreen" prompt and disables browser UI (including back button)
+        // see https://developers.google.com/web/fundamentals/web-app-manifest/#display
+        display: `standalone`,
         icon: `src/images/icon.png`, // This path is relative to the root of the site.
       },
     },
@@ -118,7 +120,9 @@ module.exports = {
         start_url: `/`,
         background_color: `#f7f0eb`,
         theme_color: `#a2466c`,
-        display: `minimal-ui`,
+        // Enables "Add to Homescreen" prompt and disables browser UI (including back button)
+        // see https://developers.google.com/web/fundamentals/web-app-manifest/#display
+        display: `standalone`,
         icon: `src/images/icon.png`, // This path is relative to the root of the site.
         icons: [
           {
@@ -155,7 +159,9 @@ module.exports = {
         start_url: `/`,
         background_color: `#f7f0eb`,
         theme_color: `#a2466c`,
-        display: `minimal-ui`,
+        // Enables "Add to Homescreen" prompt and disables browser UI (including back button)
+        // see https://developers.google.com/web/fundamentals/web-app-manifest/#display
+        display: `standalone`,
         icons: [
           {
             // Everything in /static will be copied to an equivalent
@@ -193,7 +199,7 @@ module.exports = {
         start_url: `/`,
         background_color: `#f7f0eb`,
         theme_color: `#a2466c`,
-        display: `minimal-ui`,
+        display: `standalone`,
         icon: `src/images/icon.png`, // This path is relative to the root of the site.
         legacy: true, // this will add apple-touch-icon links to <head>
       },
diff --git a/packages/gatsby-plugin-manifest/package.json b/packages/gatsby-plugin-manifest/package.json
index 22af1c02190a2..0e606bc7120c7 100644
--- a/packages/gatsby-plugin-manifest/package.json
+++ b/packages/gatsby-plugin-manifest/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-plugin-manifest",
   "description": "Gatsby plugin which adds a manifest.webmanifest to make sites progressive web apps",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
diff --git a/packages/gatsby-plugin-manifest/src/__tests__/__snapshots__/gatsby-node.js.snap b/packages/gatsby-plugin-manifest/src/__tests__/__snapshots__/gatsby-node.js.snap
index 9cc19750c8358..3dbff6ee5d17a 100644
--- a/packages/gatsby-plugin-manifest/src/__tests__/__snapshots__/gatsby-node.js.snap
+++ b/packages/gatsby-plugin-manifest/src/__tests__/__snapshots__/gatsby-node.js.snap
@@ -1,5 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test plugin manifest options correctly works with default parameters 1`] = `"{\\"name\\":\\"GatsbyJS\\",\\"short_name\\":\\"GatsbyJS\\",\\"start_url\\":\\"/\\",\\"background_color\\":\\"#f7f0eb\\",\\"theme_color\\":\\"#a2466c\\",\\"display\\":\\"minimal-ui\\",\\"icons\\":[{\\"src\\":\\"icons/icon-48x48.png\\",\\"sizes\\":\\"48x48\\",\\"type\\":\\"image/png\\"},{\\"src\\":\\"icons/icon-72x72.png\\",\\"sizes\\":\\"72x72\\",\\"type\\":\\"image/png\\"},{\\"src\\":\\"icons/icon-96x96.png\\",\\"sizes\\":\\"96x96\\",\\"type\\":\\"image/png\\"},{\\"src\\":\\"icons/icon-144x144.png\\",\\"sizes\\":\\"144x144\\",\\"type\\":\\"image/png\\"},{\\"src\\":\\"icons/icon-192x192.png\\",\\"sizes\\":\\"192x192\\",\\"type\\":\\"image/png\\"},{\\"src\\":\\"icons/icon-256x256.png\\",\\"sizes\\":\\"256x256\\",\\"type\\":\\"image/png\\"},{\\"src\\":\\"icons/icon-384x384.png\\",\\"sizes\\":\\"384x384\\",\\"type\\":\\"image/png\\"},{\\"src\\":\\"icons/icon-512x512.png\\",\\"sizes\\":\\"512x512\\",\\"type\\":\\"image/png\\"}]}"`;
+exports[`Test plugin manifest options correctly works with default parameters 1`] = `"{\\"name\\":\\"GatsbyJS\\",\\"short_name\\":\\"GatsbyJS\\",\\"start_url\\":\\"/\\",\\"background_color\\":\\"#f7f0eb\\",\\"theme_color\\":\\"#a2466c\\",\\"display\\":\\"standalone\\",\\"icons\\":[{\\"src\\":\\"icons/icon-48x48.png\\",\\"sizes\\":\\"48x48\\",\\"type\\":\\"image/png\\"},{\\"src\\":\\"icons/icon-72x72.png\\",\\"sizes\\":\\"72x72\\",\\"type\\":\\"image/png\\"},{\\"src\\":\\"icons/icon-96x96.png\\",\\"sizes\\":\\"96x96\\",\\"type\\":\\"image/png\\"},{\\"src\\":\\"icons/icon-144x144.png\\",\\"sizes\\":\\"144x144\\",\\"type\\":\\"image/png\\"},{\\"src\\":\\"icons/icon-192x192.png\\",\\"sizes\\":\\"192x192\\",\\"type\\":\\"image/png\\"},{\\"src\\":\\"icons/icon-256x256.png\\",\\"sizes\\":\\"256x256\\",\\"type\\":\\"image/png\\"},{\\"src\\":\\"icons/icon-384x384.png\\",\\"sizes\\":\\"384x384\\",\\"type\\":\\"image/png\\"},{\\"src\\":\\"icons/icon-512x512.png\\",\\"sizes\\":\\"512x512\\",\\"type\\":\\"image/png\\"}]}"`;
 
 exports[`Test plugin manifest options fails on non existing icon 1`] = `"icon (non/existing/path) does not exist as defined in gatsby-config.js. Make sure the file exists relative to the root of the site."`;
diff --git a/packages/gatsby-plugin-manifest/src/__tests__/gatsby-node.js b/packages/gatsby-plugin-manifest/src/__tests__/gatsby-node.js
index b3ac1c1b66d7d..39a2695968b28 100644
--- a/packages/gatsby-plugin-manifest/src/__tests__/gatsby-node.js
+++ b/packages/gatsby-plugin-manifest/src/__tests__/gatsby-node.js
@@ -21,7 +21,7 @@ describe(`Test plugin manifest options`, () => {
       start_url: `/`,
       background_color: `#f7f0eb`,
       theme_color: `#a2466c`,
-      display: `minimal-ui`,
+      display: `standalone`,
     })
     const [filePath, contents] = fs.writeFileSync.mock.calls[0]
     expect(filePath).toEqual(path.join(`public`, `manifest.webmanifest`))
@@ -36,7 +36,7 @@ describe(`Test plugin manifest options`, () => {
       start_url: `/`,
       background_color: `#f7f0eb`,
       theme_color: `#a2466c`,
-      display: `minimal-ui`,
+      display: `standalone`,
       icon: `non/existing/path`,
       icons: [
         {
@@ -58,7 +58,7 @@ describe(`Test plugin manifest options`, () => {
       start_url: `/`,
       background_color: `#f7f0eb`,
       theme_color: `#a2466c`,
-      display: `minimal-ui`,
+      display: `standalone`,
       icons: [
         {
           src: `icons/icon-48x48.png`,
diff --git a/packages/gatsby-plugin-offline/.gitignore b/packages/gatsby-plugin-offline/.gitignore
index 8c9686624a187..10cf84f0d2dc8 100644
--- a/packages/gatsby-plugin-offline/.gitignore
+++ b/packages/gatsby-plugin-offline/.gitignore
@@ -1,3 +1,4 @@
 /*.js
 !index.js
+!sw-append.js
 yarn.lock
diff --git a/packages/gatsby-plugin-offline/README.md b/packages/gatsby-plugin-offline/README.md
index 01ebf254e5d91..073aa58715007 100644
--- a/packages/gatsby-plugin-offline/README.md
+++ b/packages/gatsby-plugin-offline/README.md
@@ -40,12 +40,12 @@ const options = {
   cacheId: `gatsby-plugin-offline`,
   // Don't cache-bust JS or CSS files, and anything in the static directory,
   // since these files have unique URLs and their contents will never change
-  dontCacheBustUrlsMatching: /(\.js$|\.css$|\/static\/)/,
+  dontCacheBustUrlsMatching: /(\.js$|\.css$|static\/)/,
   runtimeCaching: [
     {
       // Use cacheFirst since these don't need to be revalidated (same RegExp
       // and same reason as above)
-      urlPattern: /(\.js$|\.css$|\/static\/)/,
+      urlPattern: /(\.js$|\.css$|static\/)/,
       handler: `cacheFirst`,
     },
     {
diff --git a/packages/gatsby-plugin-offline/src/gatsby-node.js b/packages/gatsby-plugin-offline/src/gatsby-node.js
index c522b426b51f1..4d014c439ed8a 100644
--- a/packages/gatsby-plugin-offline/src/gatsby-node.js
+++ b/packages/gatsby-plugin-offline/src/gatsby-node.js
@@ -82,12 +82,12 @@ exports.onPostBuild = (args, pluginOptions) => {
     cacheId: `gatsby-plugin-offline`,
     // Don't cache-bust JS or CSS files, and anything in the static directory,
     // since these files have unique URLs and their contents will never change
-    dontCacheBustUrlsMatching: /(\.js$|\.css$|\/static\/)/,
+    dontCacheBustUrlsMatching: /(\.js$|\.css$|static\/)/,
     runtimeCaching: [
       {
         // Use cacheFirst since these don't need to be revalidated (same RegExp
         // and same reason as above)
-        urlPattern: /(\.js$|\.css$|\/static\/)/,
+        urlPattern: /(\.js$|\.css$|static\/)/,
         handler: `cacheFirst`,
       },
       {
@@ -126,7 +126,7 @@ exports.onPostBuild = (args, pluginOptions) => {
         .readFileSync(`${__dirname}/sw-append.js`, `utf8`)
         .replace(/%pathPrefix%/g, pathPrefix)
 
-      fs.appendFileSync(`public/sw.js`, swAppend)
+      fs.appendFileSync(`public/sw.js`, `\n` + swAppend)
       console.log(
         `Generated ${swDest}, which will precache ${count} files, totaling ${size} bytes.`
       )
diff --git a/packages/gatsby-plugin-offline/src/sw-append.js b/packages/gatsby-plugin-offline/sw-append.js
similarity index 100%
rename from packages/gatsby-plugin-offline/src/sw-append.js
rename to packages/gatsby-plugin-offline/sw-append.js
diff --git a/packages/gatsby-remark-code-repls/CHANGELOG.md b/packages/gatsby-remark-code-repls/CHANGELOG.md
index 4a492fc519355..025ddf41ba3c3 100644
--- a/packages/gatsby-remark-code-repls/CHANGELOG.md
+++ b/packages/gatsby-remark-code-repls/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="2.0.3"></a>
+
+## [2.0.3](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-remark-code-repls/compare/gatsby-remark-code-repls@2.0.2...gatsby-remark-code-repls@2.0.3) (2018-12-11)
+
+**Note:** Version bump only for package gatsby-remark-code-repls
+
 <a name="2.0.2"></a>
 
 ## [2.0.2](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-remark-code-repls/compare/gatsby-remark-code-repls@2.0.1...gatsby-remark-code-repls@2.0.2) (2018-11-29)
diff --git a/packages/gatsby-remark-code-repls/package.json b/packages/gatsby-remark-code-repls/package.json
index 3001dbcf0cec3..147e149967b75 100644
--- a/packages/gatsby-remark-code-repls/package.json
+++ b/packages/gatsby-remark-code-repls/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-remark-code-repls",
   "description": "Gatsby plugin to auto-generate links to popular REPLs like Babel and Codepen",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "author": "Brian Vaughn <brian.david.vaughn@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
diff --git a/packages/gatsby-remark-images-contentful/CHANGELOG.md b/packages/gatsby-remark-images-contentful/CHANGELOG.md
index adba03e229830..5daa342956565 100644
--- a/packages/gatsby-remark-images-contentful/CHANGELOG.md
+++ b/packages/gatsby-remark-images-contentful/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="2.0.5"></a>
+
+## [2.0.5](https://github.com/gatsbyjs/gatsby/compare/gatsby-remark-images-contentful@2.0.4...gatsby-remark-images-contentful@2.0.5) (2018-12-11)
+
+### Bug Fixes
+
+- **gatsby-remark-images-contentful:** fix image urls with https/http prefix ([#7537](https://github.com/gatsbyjs/gatsby/issues/7537)) ([768aaa0](https://github.com/gatsbyjs/gatsby/commit/768aaa0))
+
 <a name="2.0.4"></a>
 
 ## [2.0.4](https://github.com/gatsbyjs/gatsby/compare/gatsby-remark-images-contentful@2.0.3...gatsby-remark-images-contentful@2.0.4) (2018-11-20)
diff --git a/packages/gatsby-remark-images-contentful/package.json b/packages/gatsby-remark-images-contentful/package.json
index d4c72d4abc66b..ae3ec7115dee8 100644
--- a/packages/gatsby-remark-images-contentful/package.json
+++ b/packages/gatsby-remark-images-contentful/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-remark-images-contentful",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Process Images in Contentful markdown so they can use the images API.",
   "main": "index.js",
   "scripts": {
diff --git a/packages/gatsby-remark-images-contentful/src/__tests__/__snapshots__/index.js.snap b/packages/gatsby-remark-images-contentful/src/__tests__/__snapshots__/index.js.snap
index be1725544eddb..8ce88e806f5ce 100644
--- a/packages/gatsby-remark-images-contentful/src/__tests__/__snapshots__/index.js.snap
+++ b/packages/gatsby-remark-images-contentful/src/__tests__/__snapshots__/index.js.snap
@@ -2,7 +2,7 @@
 
 exports[`it transforms HTML img tags 1`] = `
 "
-<a class=\\"gatsby-resp-image-link\\" href=\\"//images.ctfassets.net/rocybtov1ozk/wtrHxeu3zEoEce2MokCSi/73dce36715f16e27cf5ff0d2d97d7dff/quwowooybuqbl6ntboz3.jpg\\" style=\\"display: block\\" target=\\"_blank\\" rel=\\"noopener\\">
+<a class=\\"gatsby-resp-image-link\\" href=\\"https://images.ctfassets.net/rocybtov1ozk/wtrHxeu3zEoEce2MokCSi/73dce36715f16e27cf5ff0d2d97d7dff/quwowooybuqbl6ntboz3.jpg\\" style=\\"display: block\\" target=\\"_blank\\" rel=\\"noopener\\">
 
   <span class=\\"gatsby-resp-image-wrapper\\" style=\\"position: relative; display: block; ; max-width: 600px; margin-left: auto; margin-right: auto;\\">
     <span class=\\"gatsby-resp-image-background-image\\" style=\\"padding-bottom: 100%; position: relative; bottom: 0; left: 0; background-image: url(&apos;data:image;&apos;); background-size: cover; display: block;\\">
@@ -18,7 +18,41 @@ exports[`it transforms images in markdown 1`] = `
 "
 <a
   class=\\"gatsby-resp-image-link\\"
-  href=\\"//images.ctfassets.net/rocybtov1ozk/wtrHxeu3zEoEce2MokCSi/73dce36715f16e27cf5ff0d2d97d7dff/quwowooybuqbl6ntboz3.jpg\\"
+  href=\\"https://images.ctfassets.net/rocybtov1ozk/wtrHxeu3zEoEce2MokCSi/73dce36715f16e27cf5ff0d2d97d7dff/quwowooybuqbl6ntboz3.jpg\\"
+  style=\\"display: block\\"
+  target=\\"_blank\\"
+  rel=\\"noopener\\"
+>
+
+  <span
+    class=\\"gatsby-resp-image-wrapper\\"
+    style=\\"position: relative; display: block; ; max-width: 600px; margin-left: auto; margin-right: auto;\\"
+  >
+    <span
+      class=\\"gatsby-resp-image-background-image\\"
+      style=\\"padding-bottom: 100%; position: relative; bottom: 0; left: 0; background-image: url('data:image;'); background-size: cover; display: block;\\"
+    >
+      <img
+        class=\\"gatsby-resp-image-image\\"
+        style=\\"width: 100%; height: 100%; margin: 0; vertical-align: middle; position: absolute; top: 0; left: 0; box-shadow: inset 0px 0px 0px 400px white;\\"
+        alt=\\"image\\"
+        title=\\"\\"
+        src=\\"https://images.ctfassets.net/rocybtov1ozk/wtrHxeu3zEoEce2MokCSi/73dce36715f16e27cf5ff0d2d97d7dff/quwowooybuqbl6ntboz3.jpg\\"
+        srcset=\\"srcSet\\"
+        sizes=\\"128px,250px\\"
+      />
+    </span>
+  </span>
+  
+</a>
+  "
+`;
+
+exports[`it transforms images with a https scheme in markdown 1`] = `
+"
+<a
+  class=\\"gatsby-resp-image-link\\"
+  href=\\"https://images.ctfassets.net/rocybtov1ozk/wtrHxeu3zEoEce2MokCSi/73dce36715f16e27cf5ff0d2d97d7dff/quwowooybuqbl6ntboz3.jpg\\"
   style=\\"display: block\\"
   target=\\"_blank\\"
   rel=\\"noopener\\"
diff --git a/packages/gatsby-remark-images-contentful/src/__tests__/index.js b/packages/gatsby-remark-images-contentful/src/__tests__/index.js
index 9b37a5000f54c..f8b5fbf1c77a9 100644
--- a/packages/gatsby-remark-images-contentful/src/__tests__/index.js
+++ b/packages/gatsby-remark-images-contentful/src/__tests__/index.js
@@ -135,6 +135,22 @@ test(`it transforms images in markdown`, async () => {
   expect(node.value).not.toMatch(`<html>`)
 })
 
+test(`it transforms images with a https scheme in markdown`, async () => {
+  const imagePath = `https://images.ctfassets.net/rocybtov1ozk/wtrHxeu3zEoEce2MokCSi/73dce36715f16e27cf5ff0d2d97d7dff/quwowooybuqbl6ntboz3.jpg`
+  const content = `
+![image](${imagePath})
+  `.trim()
+
+  const nodes = await plugin(createPluginOptions(content, imagePath))
+
+  expect(nodes.length).toBe(1)
+
+  const node = nodes.pop()
+  expect(node.type).toBe(`html`)
+  expect(node.value).toMatchSnapshot()
+  expect(node.value).not.toMatch(`<html>`)
+})
+
 test(`it transforms multiple images in markdown`, async () => {
   const imagePaths = [
     `//images.ctfassets.net/rocybtov1ozk/wtrHxeu3zEoEce2MokCSi/73dce36715f16e27cf5ff0d2d97d7dff/quwowooybuqbl6ntboz3.jpg`,
diff --git a/packages/gatsby-remark-images-contentful/src/index.js b/packages/gatsby-remark-images-contentful/src/index.js
index 1feee08858458..3eb9374c73cb8 100644
--- a/packages/gatsby-remark-images-contentful/src/index.js
+++ b/packages/gatsby-remark-images-contentful/src/index.js
@@ -40,6 +40,11 @@ module.exports = async (
       return resolve()
     }
 
+    let originalImg = node.url
+    if (!/^(http|https)?:\/\//i.test(node.url)) {
+      originalImg = `https:${node.url}`
+    }
+
     const srcSplit = node.url.split(`/`)
     const fileName = srcSplit[srcSplit.length - 1]
     const options = _.defaults(pluginOptions, defaults)
@@ -59,7 +64,7 @@ module.exports = async (
 
     const response = await axios({
       method: `GET`,
-      url: `https:${node.url}`, // for some reason there is a './' prefix
+      url: originalImg, // for some reason there is a './' prefix
       responseType: `stream`,
     })
 
@@ -71,18 +76,18 @@ module.exports = async (
 
     const responsiveSizesResult = await buildResponsiveSizes({
       metadata,
-      imageUrl: `https:${node.url}`,
+      imageUrl: originalImg,
       options,
     })
+
     // Calculate the paddingBottom %
     const ratio = `${(1 / responsiveSizesResult.aspectRatio) * 100}%`
 
-    const fallbackSrc = `https:${node.url}`
+    const fallbackSrc = originalImg
     const srcSet = responsiveSizesResult.srcSet
     const presentationWidth = responsiveSizesResult.presentationWidth
 
     // Generate default alt tag
-    const originalImg = node.url
     const fileNameNoExt = fileName.replace(/\.[^/.]+$/, ``)
     const defaultAlt = fileNameNoExt.replace(/[^A-Z0-9]/gi, ` `)
 
diff --git a/packages/gatsby-source-contentful/CHANGELOG.md b/packages/gatsby-source-contentful/CHANGELOG.md
index 8179ef1d4d595..76797dda81a51 100644
--- a/packages/gatsby-source-contentful/CHANGELOG.md
+++ b/packages/gatsby-source-contentful/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="2.0.20"></a>
+
+## [2.0.20](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-contentful/compare/gatsby-source-contentful@2.0.19...gatsby-source-contentful@2.0.20) (2018-12-11)
+
+**Note:** Version bump only for package gatsby-source-contentful
+
 <a name="2.0.19"></a>
 
 ## [2.0.19](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-contentful/compare/gatsby-source-contentful@2.0.18...gatsby-source-contentful@2.0.19) (2018-12-07)
diff --git a/packages/gatsby-source-contentful/package.json b/packages/gatsby-source-contentful/package.json
index d3d1924182dce..b2b5c811cc9ae 100644
--- a/packages/gatsby-source-contentful/package.json
+++ b/packages/gatsby-source-contentful/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-source-contentful",
   "description": "Gatsby source plugin for building websites using the Contentful CMS as a data source",
-  "version": "2.0.19",
+  "version": "2.0.20",
   "author": "Marcus Ericsson <mericsson@gmail.com> (mericsson.com)",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
diff --git a/packages/gatsby-source-drupal/CHANGELOG.md b/packages/gatsby-source-drupal/CHANGELOG.md
index 2de2889730403..28a35bcb5e291 100644
--- a/packages/gatsby-source-drupal/CHANGELOG.md
+++ b/packages/gatsby-source-drupal/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="3.0.14"></a>
+
+## [3.0.14](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-drupal/compare/gatsby-source-drupal@3.0.13...gatsby-source-drupal@3.0.14) (2018-12-11)
+
+**Note:** Version bump only for package gatsby-source-drupal
+
 <a name="3.0.13"></a>
 
 ## [3.0.13](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-drupal/compare/gatsby-source-drupal@3.0.12...gatsby-source-drupal@3.0.13) (2018-12-06)
diff --git a/packages/gatsby-source-drupal/package.json b/packages/gatsby-source-drupal/package.json
index 43027e678d86c..bd011616bcca3 100644
--- a/packages/gatsby-source-drupal/package.json
+++ b/packages/gatsby-source-drupal/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-source-drupal",
   "description": "Gatsby source plugin for building websites using the Drupal CMS as a data source",
-  "version": "3.0.13",
+  "version": "3.0.14",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -10,7 +10,7 @@
     "@babel/runtime": "^7.0.0",
     "axios": "^0.18.0",
     "bluebird": "^3.5.0",
-    "gatsby-source-filesystem": "^2.0.11",
+    "gatsby-source-filesystem": "^2.0.12",
     "lodash": "^4.17.10"
   },
   "devDependencies": {
diff --git a/packages/gatsby-source-filesystem/CHANGELOG.md b/packages/gatsby-source-filesystem/CHANGELOG.md
index 5c7dc29a163f6..4bd2a03238844 100644
--- a/packages/gatsby-source-filesystem/CHANGELOG.md
+++ b/packages/gatsby-source-filesystem/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="2.0.12"></a>
+
+## [2.0.12](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-filesystem/compare/gatsby-source-filesystem@2.0.11...gatsby-source-filesystem@2.0.12) (2018-12-11)
+
+### Features
+
+- **gatsby-source-filesystem:** keep original name of remote files ([#9777](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-filesystem/issues/9777)) ([dfc069d](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-filesystem/commit/dfc069d))
+
 <a name="2.0.11"></a>
 
 ## [2.0.11](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-filesystem/compare/gatsby-source-filesystem@2.0.10...gatsby-source-filesystem@2.0.11) (2018-12-06)
diff --git a/packages/gatsby-source-filesystem/package.json b/packages/gatsby-source-filesystem/package.json
index 48fa020653c22..4572cd9ea64e1 100644
--- a/packages/gatsby-source-filesystem/package.json
+++ b/packages/gatsby-source-filesystem/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-source-filesystem",
   "description": "Gatsby plugin which parses files within a directory for further parsing by other plugins",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
diff --git a/packages/gatsby-source-mongodb/CHANGELOG.md b/packages/gatsby-source-mongodb/CHANGELOG.md
index e6ec58c1e8e57..9cd0b5850b6fd 100644
--- a/packages/gatsby-source-mongodb/CHANGELOG.md
+++ b/packages/gatsby-source-mongodb/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="2.0.10"></a>
+
+## [2.0.10](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-mongodb/compare/gatsby-source-mongodb@2.0.9...gatsby-source-mongodb@2.0.10) (2018-12-11)
+
+**Note:** Version bump only for package gatsby-source-mongodb
+
 <a name="2.0.9"></a>
 
 ## [2.0.9](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-mongodb/compare/gatsby-source-mongodb@2.0.8...gatsby-source-mongodb@2.0.9) (2018-11-29)
diff --git a/packages/gatsby-source-mongodb/package.json b/packages/gatsby-source-mongodb/package.json
index b0bcae42c3f08..502e89c29fa57 100644
--- a/packages/gatsby-source-mongodb/package.json
+++ b/packages/gatsby-source-mongodb/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-source-mongodb",
   "description": "Source plugin for pulling data into Gatsby from MongoDB collections",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "author": "jhermans85@hotmail.com",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
diff --git a/packages/gatsby-source-wordpress/CHANGELOG.md b/packages/gatsby-source-wordpress/CHANGELOG.md
index d3a0b8ae54d1a..fc9c8a8d4a5dd 100644
--- a/packages/gatsby-source-wordpress/CHANGELOG.md
+++ b/packages/gatsby-source-wordpress/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="3.0.20"></a>
+
+## [3.0.20](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-wordpress/compare/gatsby-source-wordpress@3.0.19...gatsby-source-wordpress@3.0.20) (2018-12-11)
+
+**Note:** Version bump only for package gatsby-source-wordpress
+
 <a name="3.0.19"></a>
 
 ## [3.0.19](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-wordpress/compare/gatsby-source-wordpress@3.0.18...gatsby-source-wordpress@3.0.19) (2018-12-06)
diff --git a/packages/gatsby-source-wordpress/package.json b/packages/gatsby-source-wordpress/package.json
index 931fa7c1cd46c..fa76e4ce08558 100644
--- a/packages/gatsby-source-wordpress/package.json
+++ b/packages/gatsby-source-wordpress/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-source-wordpress",
   "description": "Gatsby source plugin for building websites using the Wordpress CMS as a data source.",
-  "version": "3.0.19",
+  "version": "3.0.20",
   "author": "Sebastien Fichot <fichot.sebastien@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -14,7 +14,7 @@
     "bluebird": "^3.5.0",
     "deep-map": "^1.5.0",
     "deep-map-keys": "^1.2.0",
-    "gatsby-source-filesystem": "^2.0.11",
+    "gatsby-source-filesystem": "^2.0.12",
     "json-stringify-safe": "^5.0.1",
     "lodash": "^4.17.10",
     "minimatch": "^3.0.4",
diff --git a/packages/gatsby/CHANGELOG.md b/packages/gatsby/CHANGELOG.md
index e799ba3353cca..d2079e55b595d 100644
--- a/packages/gatsby/CHANGELOG.md
+++ b/packages/gatsby/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="2.0.67"></a>
+
+## [2.0.67](https://github.com/gatsbyjs/gatsby/compare/gatsby@2.0.66...gatsby@2.0.67) (2018-12-13)
+
+### Bug Fixes
+
+- **gatsby:** fix extracting StaticQuery nested in shorthand fragment ([#10443](https://github.com/gatsbyjs/gatsby/issues/10443)) ([d504d44](https://github.com/gatsbyjs/gatsby/commit/d504d44))
+
+<a name="2.0.66"></a>
+
+## [2.0.66](https://github.com/gatsbyjs/gatsby/compare/gatsby@2.0.65...gatsby@2.0.66) (2018-12-11)
+
+### Features
+
+- **prefetch:** add support for effective-connection-type & saveData ([#10365](https://github.com/gatsbyjs/gatsby/issues/10365)) ([1c51831](https://github.com/gatsbyjs/gatsby/commit/1c51831))
+
+<a name="2.0.65"></a>
+
+## [2.0.65](https://github.com/gatsbyjs/gatsby/compare/gatsby@2.0.64...gatsby@2.0.65) (2018-12-11)
+
+### Bug Fixes
+
+- **gatsby:** fix false type conflict warning on plugin fields ([#10355](https://github.com/gatsbyjs/gatsby/issues/10355)) ([510fb88](https://github.com/gatsbyjs/gatsby/commit/510fb88))
+
 <a name="2.0.64"></a>
 
 ## [2.0.64](https://github.com/gatsbyjs/gatsby/compare/gatsby@2.0.63...gatsby@2.0.64) (2018-12-07)
diff --git a/packages/gatsby/cache-dir/ensure-resources.js b/packages/gatsby/cache-dir/ensure-resources.js
index 53b611c0aa4ba..7b2f38244c043 100644
--- a/packages/gatsby/cache-dir/ensure-resources.js
+++ b/packages/gatsby/cache-dir/ensure-resources.js
@@ -3,6 +3,8 @@ import PropTypes from "prop-types"
 import loader from "./loader"
 import shallowCompare from "shallow-compare"
 
+let isInitialRender = true
+
 // Pass pathname in as prop.
 // component will try fetching resources. If they exist,
 // will just render, else will render null.
@@ -19,53 +21,86 @@ class EnsureResources extends React.Component {
     }
   }
 
-  static getDerivedStateFromProps({ pageResources, location }, prevState) {
+  reloadPage(prevHref) {
+    // Do this, rather than simply `window.location.reload()`, so that
+    // pressing the back/forward buttons work - otherwise when pressing
+    // back, the browser will just change the URL and expect JS to handle
+    // the change, which won't always work since it might not be a Gatsby
+    // page.
+    const { href } = window.location
+    window.history.replaceState({}, ``, prevHref)
+    window.location.replace(href)
+  }
+
+  static getDerivedStateFromProps({ location }, prevState) {
     if (prevState.location !== location) {
       const pageResources = loader.getResourcesForPathnameSync(
         location.pathname
       )
 
-      if (pageResources) {
-        return {
-          pageResources,
-          location: { ...location },
-        }
+      return {
+        pageResources,
+        location: { ...location },
       }
     }
 
     return null
   }
 
-  componentDidUpdate(prevProps) {
-    if (prevProps === this.props) return
+  hasResources(pageResources) {
+    if (pageResources && pageResources.json) {
+      return true
+    }
 
-    const { pathname } = this.props.location
+    if (pageResources && process.env.NODE_ENV !== `production`) {
+      return true
+    }
+
+    return false
+  }
+
+  retryResources(nextProps) {
+    const { pathname } = nextProps.location
+
+    if (!loader.getResourcesForPathnameSync(pathname)) {
+      // Store the previous and next location before resolving resources
+      const prevLocation = this.props.location
+      this.nextLocation = nextProps.location
 
-    if (!loader.getResourcesForPathnameSync(pathname))
       // Page resources won't be set in cases where the browser back button
       // or forward button is pushed as we can't wait as normal for resources
       // to load before changing the page.
       loader.getResourcesForPathname(pathname).then(pageResources => {
         // The page may have changed since we started this, in which case doesn't update
+        if (this.nextLocation !== nextProps.location) {
+          return
+        }
 
-        if (this.props.location.pathname !== location.pathname) {
+        if (this.hasResources(pageResources)) {
+          this.setState({
+            location: { ...window.location },
+            pageResources,
+          })
           return
         }
 
-        this.setState({
-          location: { ...location },
-          pageResources,
-        })
+        // If we still don't have resources, reload the page.
+        // (This won't happen on initial render, since shouldComponentUpdate
+        // is only called when the component updates.)
+        this.reloadPage(prevLocation.href)
       })
+    }
   }
 
   shouldComponentUpdate(nextProps, nextState) {
-    // 404
-    if (!nextState.pageResources) {
-      return true
+    // Always return false if we're missing resources.
+    if (!this.hasResources(nextState.pageResources)) {
+      this.retryResources(nextProps)
+      return false
     }
+
     // Check if the component or json have changed.
-    if (!this.state.pageResources && nextState.pageResources) {
+    if (this.state.pageResources !== nextState.pageResources) {
       return true
     }
     if (
@@ -92,54 +127,14 @@ class EnsureResources extends React.Component {
     return shallowCompare(this, nextProps, nextState)
   }
 
-  shouldRenderStaticHTML() {
-    const { localStorage } = window
-    const { href, pathname } = window.location
-
-    // This should only occur if the network is offline, or if the
-    // path is nonexistent and there's no custom 404 page.
-    if (
-      process.env.NODE_ENV === `production` &&
-      !(this.state.pageResources && this.state.pageResources.json)
-    ) {
-      if (localStorage.getItem(`___failedResources`) === pathname) {
-        // Maybe it will work again in the future, so remove the flag
-        localStorage.removeItem(`___failedResources`)
-        console.error(
-          `WARNING: Resources cannot be loaded for the pathname ${pathname} - ` +
-            `falling back to static HTML instead.\n` +
-            `This is likely due to a bug in Gatsby, or misconfiguration in your project.`
-        )
-      } else {
-        // Mark the pathname as failed
-        localStorage.setItem(`___failedResources`, pathname)
-
-        // Reload the page.
-        // Do this, rather than simply `window.location.reload()`, so that
-        // pressing the back/forward buttons work - otherwise when pressing
-        // back, the browser will just change the URL and expect JS to handle
-        // the change, which won't always work since it might not be a Gatsby
-        // page.
-        const originalUrl = new URL(href)
-        window.history.replaceState({}, `404`, `${pathname}?gatsby-404`)
-        window.location.replace(originalUrl)
-      }
-
-      return true
-    } else {
-      localStorage.removeItem(`___failedResources`)
-      return false
-    }
-  }
-
   render() {
-    // TODO: find a nicer way to do this (e.g. React Suspense)
-    if (this.shouldRenderStaticHTML()) {
-      const __html = document.getElementById(`___gatsby`).innerHTML
-      return <div dangerouslySetInnerHTML={{ __html }} />
-    } else {
-      return this.props.children(this.state)
+    if (!this.hasResources(this.state.pageResources) && isInitialRender) {
+      // prevent hydrating
+      throw new Error(`Missing resources for ${this.state.location.pathname}`)
     }
+
+    isInitialRender = false
+    return this.props.children(this.state)
   }
 }
 
diff --git a/packages/gatsby/cache-dir/loader.js b/packages/gatsby/cache-dir/loader.js
index 23a3dde924a7e..e4fe1928c53b5 100644
--- a/packages/gatsby/cache-dir/loader.js
+++ b/packages/gatsby/cache-dir/loader.js
@@ -89,8 +89,7 @@ const fetchResource = resourceName => {
     const fetchPromise = resourceFunction()
     let failed = false
     return fetchPromise
-      .catch(e => {
-        console.error(e)
+      .catch(() => {
         failed = true
       })
       .then(component => {
@@ -193,6 +192,16 @@ const queue = {
     if (!apiRunner)
       console.error(`Run setApiRunnerForLoader() before enqueing paths`)
 
+    // Skip prefetching if we know user is on slow or constrained connection
+    if (`connection` in navigator) {
+      if ((navigator.connection.effectiveType || ``).includes(`2g`)) {
+        return false
+      }
+      if (navigator.connection.saveData) {
+        return false
+      }
+    }
+
     // Tell plugins with custom prefetching logic that they should start
     // prefetching this path.
     onPrefetchPathname(path)
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
index df92197dc9194..8901070ed48f7 100644
--- a/packages/gatsby/package.json
+++ b/packages/gatsby/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby",
   "description": "Blazing fast modern site generator for React",
-  "version": "2.0.64",
+  "version": "2.0.67",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bin": {
     "gatsby": "./dist/bin/gatsby.js"
@@ -27,7 +27,6 @@
     "babel-plugin-dynamic-import-node": "^1.2.0",
     "babel-plugin-remove-graphql-queries": "^2.5.2",
     "babel-preset-gatsby": "^0.1.6",
-    "babel-traverse": "6.26.0",
     "better-queue": "^3.8.6",
     "bluebird": "^3.5.0",
     "browserslist": "3.2.8",
diff --git a/packages/gatsby/src/bootstrap/resolve-module-exports.js b/packages/gatsby/src/bootstrap/resolve-module-exports.js
index 30057db5361fe..f6367f740e76e 100644
--- a/packages/gatsby/src/bootstrap/resolve-module-exports.js
+++ b/packages/gatsby/src/bootstrap/resolve-module-exports.js
@@ -1,6 +1,6 @@
 // @flow
 const fs = require(`fs`)
-const traverse = require(`babel-traverse`).default
+const traverse = require(`@babel/traverse`).default
 const get = require(`lodash/get`)
 const { codeFrameColumns } = require(`@babel/code-frame`)
 const { babelParseToAst } = require(`../utils/babel-parse-to-ast`)
diff --git a/packages/gatsby/src/internal-plugins/query-runner/__tests__/__snapshots__/file-parser.js.snap b/packages/gatsby/src/internal-plugins/query-runner/__tests__/__snapshots__/file-parser.js.snap
index d1c34627e3d77..d009d33559ca9 100644
--- a/packages/gatsby/src/internal-plugins/query-runner/__tests__/__snapshots__/file-parser.js.snap
+++ b/packages/gatsby/src/internal-plugins/query-runner/__tests__/__snapshots__/file-parser.js.snap
@@ -590,6 +590,118 @@ Map {
     ],
     "kind": "Document",
   },
+  "fragment-shorthand.js" => Object {
+    "definitions": Array [
+      Object {
+        "directives": Array [],
+        "hash": 1097489062,
+        "isStaticQuery": true,
+        "kind": "OperationDefinition",
+        "loc": Object {
+          "end": 74,
+          "start": 3,
+        },
+        "name": Object {
+          "kind": "Name",
+          "value": "fragmentShorthandJs1097489062",
+        },
+        "operation": "query",
+        "selectionSet": Object {
+          "kind": "SelectionSet",
+          "loc": Object {
+            "end": 74,
+            "start": 9,
+          },
+          "selections": Array [
+            Object {
+              "alias": undefined,
+              "arguments": Array [],
+              "directives": Array [],
+              "kind": "Field",
+              "loc": Object {
+                "end": 70,
+                "start": 15,
+              },
+              "name": Object {
+                "kind": "Name",
+                "loc": Object {
+                  "end": 19,
+                  "start": 15,
+                },
+                "value": "site",
+              },
+              "selectionSet": Object {
+                "kind": "SelectionSet",
+                "loc": Object {
+                  "end": 70,
+                  "start": 20,
+                },
+                "selections": Array [
+                  Object {
+                    "alias": undefined,
+                    "arguments": Array [],
+                    "directives": Array [],
+                    "kind": "Field",
+                    "loc": Object {
+                      "end": 64,
+                      "start": 28,
+                    },
+                    "name": Object {
+                      "kind": "Name",
+                      "loc": Object {
+                        "end": 40,
+                        "start": 28,
+                      },
+                      "value": "siteMetadata",
+                    },
+                    "selectionSet": Object {
+                      "kind": "SelectionSet",
+                      "loc": Object {
+                        "end": 64,
+                        "start": 41,
+                      },
+                      "selections": Array [
+                        Object {
+                          "alias": undefined,
+                          "arguments": Array [],
+                          "directives": Array [],
+                          "kind": "Field",
+                          "loc": Object {
+                            "end": 56,
+                            "start": 51,
+                          },
+                          "name": Object {
+                            "kind": "Name",
+                            "loc": Object {
+                              "end": 56,
+                              "start": 51,
+                            },
+                            "value": "title",
+                          },
+                          "selectionSet": undefined,
+                        },
+                      ],
+                    },
+                  },
+                ],
+              },
+            },
+          ],
+        },
+        "text": "
+  query {
+    site {
+      siteMetadata {
+        title
+      }
+    }
+  }
+",
+        "variableDefinitions": Array [],
+      },
+    ],
+    "kind": "Document",
+  },
   "query-in-separate-variable.js" => Object {
     "definitions": Array [
       Object {
diff --git a/packages/gatsby/src/internal-plugins/query-runner/__tests__/file-parser.js b/packages/gatsby/src/internal-plugins/query-runner/__tests__/file-parser.js
index 680373ccf423e..707de4a2cd9ec 100644
--- a/packages/gatsby/src/internal-plugins/query-runner/__tests__/file-parser.js
+++ b/packages/gatsby/src/internal-plugins/query-runner/__tests__/file-parser.js
@@ -80,6 +80,27 @@ export const fragment3 = graphql\`
   }
 \`
 `,
+    "fragment-shorthand.js": `import React from "react"
+import { StaticQuery, graphql } from "gatsby"
+
+const query = graphql\`
+  query {
+    site {
+      siteMetadata {
+        title
+      }
+    }
+  }
+\`
+
+export default () => (
+  <>
+    <StaticQuery
+      query={query}
+      render={data => <div>{data.title}</div>}
+    />
+  </>
+)`,
     "query-in-separate-variable.js": `import React from "react"
 import { StaticQuery, graphql } from "gatsby"
 
diff --git a/packages/gatsby/src/internal-plugins/query-runner/file-parser.js b/packages/gatsby/src/internal-plugins/query-runner/file-parser.js
index e13d818001d13..997b3c5290a29 100644
--- a/packages/gatsby/src/internal-plugins/query-runner/file-parser.js
+++ b/packages/gatsby/src/internal-plugins/query-runner/file-parser.js
@@ -4,7 +4,7 @@ const crypto = require(`crypto`)
 const _ = require(`lodash`)
 
 // Traverse is a es6 module...
-import traverse from "babel-traverse"
+import traverse from "@babel/traverse"
 const getGraphQLTag = require(`babel-plugin-remove-graphql-queries`)
   .getGraphQLTag
 const report = require(`gatsby-cli/lib/reporter`)
diff --git a/www/package.json b/www/package.json
index 5b26496fa9c9a..baa245e83b71f 100644
--- a/www/package.json
+++ b/www/package.json
@@ -26,7 +26,7 @@
     "gatsby-plugin-netlify": "^2.0.0",
     "gatsby-plugin-netlify-cache": "^0.1.0",
     "gatsby-plugin-nprogress": "^2.0.5",
-    "gatsby-plugin-offline": "^2.0.16",
+    "gatsby-plugin-offline": "^2.0.19",
     "gatsby-plugin-react-helmet": "^3.0.0",
     "gatsby-plugin-sharp": "^2.0.5",
     "gatsby-plugin-sitemap": "^2.0.1",
diff --git a/www/src/components/plugin-searchbar-body.js b/www/src/components/plugin-searchbar-body.js
index 046469db879fa..7df01bede72a7 100644
--- a/www/src/components/plugin-searchbar-body.js
+++ b/www/src/components/plugin-searchbar-body.js
@@ -174,10 +174,6 @@ injectGlobal`
 
 // Search shows a list of "hits", and is a child of the PluginSearchBar component
 class Search extends Component {
-  constructor(props, context) {
-    super(props)
-  }
-
   render() {
     return (
       <div
@@ -253,7 +249,7 @@ class Search extends Component {
                 <Result
                   hit={result.hit}
                   pathname={this.props.pathname}
-                  search={this.props.searchState}
+                  query={this.props.query}
                 />
               )}
             />
@@ -305,14 +301,14 @@ class Search extends Component {
 }
 
 // the result component is fed into the InfiniteHits component
-const Result = ({ hit, pathname, search }) => {
+const Result = ({ hit, pathname, query }) => {
   // Example:
   // pathname = `/plugins/gatsby-link/` || `/plugins/@comsoc/gatsby-mdast-copy-linked-files`
   //  hit.name = `gatsby-link` || `@comsoc/gatsby-mdast-copy-linked-files`
   const selected = pathname.includes(hit.name)
   return (
     <Link
-      to={`/packages/${hit.name}/?=${search}`}
+      to={`/packages/${hit.name}/?=${query}`}
       css={{
         "&&": {
           boxShadow: `none`,
@@ -415,7 +411,8 @@ class PluginSearchBar extends Component {
 
   urlToSearch = () => {
     if (this.props.location.search) {
-      return this.props.location.search.slice(2)
+      // ignore this automatically added query parameter
+      return this.props.location.search.replace(`no-cache=1`, ``).slice(2)
     }
     return ``
   }
@@ -426,7 +423,7 @@ class PluginSearchBar extends Component {
     })
   }
 
-  onSearchStateChange(searchState) {
+  onSearchStateChange = searchState => {
     this.updateHistory(searchState)
     this.setState({ searchState })
   }
@@ -439,11 +436,11 @@ class PluginSearchBar extends Component {
           appId="OFCNCOG2CU"
           indexName="npm-search"
           searchState={this.state.searchState}
-          onSearchStateChange={this.onSearchStateChange.bind(this)}
+          onSearchStateChange={this.onSearchStateChange}
         >
           <Search
             pathname={this.props.location.pathname}
-            searchState={this.state.searchState.query}
+            query={this.state.searchState.query}
           />
         </InstantSearch>
       </div>
diff --git a/www/src/data/sidebars/doc-links.yaml b/www/src/data/sidebars/doc-links.yaml
index d9cdce87b864d..d1bb1c07a6a2e 100644
--- a/www/src/data/sidebars/doc-links.yaml
+++ b/www/src/data/sidebars/doc-links.yaml
@@ -189,20 +189,8 @@
     - title: Use cases with Gatsby (including apps)
       link: /docs/building-apps-with-gatsby/
       items:
-        - title: Client data fetching*
-          link: /docs/client-data-fetching/
         - title: Building a site with authentication
           link: /docs/building-a-site-with-authentication/
-        - title: Building an e-commerce site*
-          link: /docs/building-an-e-commerce-site/
-        - title: Building a site with asynchronous data*
-          link: /docs/building-a-site-with-asynchronous-data/
-        - title: Building a portfolio*
-          link: /docs/building-a-portfolio/
-        - title: Building a blog*
-          link: /docs/building-a-blog/
-        - title: Building an image-heavy site*
-          link: /docs/building-an-image-heavy-site/
     - title: Adding website functionality
       link: /docs/adding-website-functionality/
       items:
diff --git a/yarn.lock b/yarn.lock
index 8b32f82cb7324..6c841fa0b1b2d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3701,7 +3701,7 @@ babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0, babel-te
     babylon "^6.18.0"
     lodash "^4.17.4"
 
-babel-traverse@6.26.0, babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
   integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=