Merge remote-tracking branch 'origin/master' into elm-serialize

Conflicts:
	src/Builder/Build.elm
	src/Builder/Deps/Registry.elm
	src/Builder/Elm/Details.elm
	src/Builder/Generate.elm
	src/Builder/Reporting/Exit.elm
	src/Compiler/AST/Canonical.elm
	src/Compiler/AST/Optimized.elm
	src/Compiler/AST/Utils/Shader.elm
	src/Compiler/Elm/Compiler/Type/Extract.elm
	src/Compiler/Elm/Docs.elm
	src/Compiler/Elm/Interface.elm
	src/Compiler/Elm/Version.elm
	src/Compiler/Json/Decode.elm
	src/Compiler/Json/Encode.elm
	src/Compiler/Optimize/DecisionTree.elm
	src/Compiler/Reporting/Error/Canonicalize.elm
	src/Compiler/Reporting/Error/Import.elm
	src/Compiler/Reporting/Error/Type.elm
	src/Compiler/Reporting/Render/Type/Localizer.elm
	src/Compiler/Type/Error.elm
	src/Data/Map.elm
	src/Utils/Main.elm