Update Windows
Merge branch 'master' into working

Conflicts:
	Packages/Default/Startup.cache
	Packages/User/Package Control.cache/ae8061fb96730630326bb694183c37e3.info
	Packages/User/Package Control.last-run