diff --git a/docs/docs/building-with-components.md b/docs/docs/building-with-components.md
index c523c4d238b50..4d5acd7f321ce 100644
--- a/docs/docs/building-with-components.md
+++ b/docs/docs/building-with-components.md
@@ -124,6 +124,9 @@ export const pageQuery = graphql`
 `src/layouts/index.jsx` (optional) wraps page components. You can use it for
 portions of pages that are shared across pages like headers and footers.
 
+You can use the `location` prop to render conditionally based on the page
+URL.
+
 Example:
 
 ```jsx
@@ -132,7 +135,11 @@ import Navigation from "../components/Navigation/Navigation.jsx";
 
 export default class Template extends React.Component {
   render() {
-    return <Navigation>{this.props.children()}</Navigation>;
+    if (this.props.location.pathname !== "/") {
+      return <Navigation>{this.props.children()}</Navigation>;
+    } else {
+      return this.props.children();
+    }
   }
 }
 ```
diff --git a/docs/docs/gatsby-starters.md b/docs/docs/gatsby-starters.md
index e7009ef028075..0410bb82678ef 100644
--- a/docs/docs/gatsby-starters.md
+++ b/docs/docs/gatsby-starters.md
@@ -298,3 +298,14 @@ Community:
   * Password Change
   * Protected Routes with Authorization
   * Realtime Database with Users
+
+* [gatsby-starter-ceevee](https://github.com/amandeepmittal/gatsby-starter-ceevee) [(demo)](http://gatsby-starter-ceevee.surge.sh/)
+
+Features:
+
+* Based on the Ceevee site template, design by [Styleshout](https://www.styeshout.com/)
+* Single Page Resume/Portfolio site
+* Target audience Developers, Designers, etc.
+* Used CSS Modules, easy to manipulate
+* FontAwsome Library for icons
+* Responsive Design, optimized for Mobile devices
diff --git a/docs/docs/plugins.md b/docs/docs/plugins.md
index 800e5c540e4fc..fb5cb0a9ebfbb 100644
--- a/docs/docs/plugins.md
+++ b/docs/docs/plugins.md
@@ -76,6 +76,7 @@ root.
 
 ## Official plugins
 
+* [gatsby-plugin-canonical-urls](/packages/gatsby-plugin-canonical-urls/)
 * [gatsby-plugin-catch-links](/packages/gatsby-plugin-catch-links/)
 * [gatsby-plugin-create-client-paths](/packages/gatsby-plugin-create-client-paths/)
 * [gatsby-plugin-coffeescript](/packages/gatsby-plugin-coffeescript/)
@@ -148,6 +149,7 @@ root.
 * [gatsby-plugin-segment-js](https://github.com/benjaminhoffman/gatsby-plugin-segment-js)
 * [gatsby-plugin-stripe-checkout](https://github.com/njosefbeck/gatsby-plugin-stripe-checkout)
 * [gatsby-plugin-stripe-elements](https://github.com/njosefbeck/gatsby-plugin-stripe-elements)
+* [gatsby-plugin-svg-sprite](https://github.com/marcobiedermann/gatsby-plugin-svg-sprite)
 * [gatsby-plugin-svgr](https://github.com/zabute/gatsby-plugin-svgr)
 * [gatsby-plugin-typescript-css-modules](https://github.com/jcreamer898/gatsby-plugin-typescript-css-modules)
 * [gatsby-plugin-yandex-metrika](https://github.com/viatsko/gatsby-plugin-yandex-metrika)
diff --git a/docs/tutorial/part-one/index.md b/docs/tutorial/part-one/index.md
index b9387fc1db17c..a46e91cba0d9a 100644
--- a/docs/tutorial/part-one/index.md
+++ b/docs/tutorial/part-one/index.md
@@ -134,7 +134,7 @@ export default () =>
  <div style={{ color: `tomato` }}>
    <h1>Hello Gatsby!</h1>
    <p>What a world.</p>
-   <img src="http://lorempixel.com/400/200/" alt="" />
+   <img src="https://source.unsplash.com/random/400x200" alt="" />
  </div>
 ```
 
@@ -166,7 +166,7 @@ export default () =>
   <div style={{ color: `tomato` }}>
     <h1>Hello Gatsby!</h1>
     <p>What a world.</p>
-    <img src="http://lorempixel.com/400/200/" alt="" />
+    <img src="https://source.unsplash.com/random/400x200" alt="" />
     <br />
     <div>
       <Link to="/page-2/">Link</Link>
@@ -222,7 +222,7 @@ export default () =>
   <div style={{ color: `tomato` }}>
     <h1>Hello Gatsby!</h1>
     <p>What a world.</p>
-    <img src="http://lorempixel.com/400/200/" alt="" />
+    <img src="https://source.unsplash.com/random/400x200" alt="" />
     <br />
     <div>
       <Link to="/page-2/">Link</Link>
diff --git a/packages/gatsby-plugin-canonical-urls/src/gatsby-browser.js b/packages/gatsby-plugin-canonical-urls/src/gatsby-browser.js
new file mode 100644
index 0000000000000..e1102c3cd87ec
--- /dev/null
+++ b/packages/gatsby-plugin-canonical-urls/src/gatsby-browser.js
@@ -0,0 +1,4 @@
+exports.onRouteUpdate = ({ location }) => {
+  const domElem = document.querySelector(`link[rel='canonical']`)
+  domElem.setAttribute(`href`, `${window.location.origin}${location.pathname}`)
+}
diff --git a/packages/gatsby/src/commands/build-html.js b/packages/gatsby/src/commands/build-html.js
index 2ebd8d3bd3b14..aba29d71de0ae 100644
--- a/packages/gatsby/src/commands/build-html.js
+++ b/packages/gatsby/src/commands/build-html.js
@@ -44,6 +44,7 @@ module.exports = async (program: any) => {
       // Remove the temp JS bundle file built for the static-site-generator-plugin
       try {
         fs.unlinkSync(outputFile)
+        fs.unlinkSync(`${outputFile}.map`)
       } catch (e) {
         // This function will fail on Windows with no further consequences.
       }