Merge remote-tracking branch 'origin/master' into cj-windows-build-instructions-update

Conflicts:
	docs/build-instructions/windows.md

docs/build-instructions/windows.md

@@ -13,6 +13,7 @@
   ```bat
   # Use the `Git Shell` app which was installed by GitHub for Windows. Also Make
   # sure you have logged into the GitHub for Windows GUI App.
+  cd C:\
   git clone https://github.com/atom/atom/
   cd atom
   script\build