diff --git a/build/win32/OSSREADME.json b/build/win32/OSSREADME.json
old mode 100644
new mode 100755
index f66fde6fb6d..cbcef582e54
--- a/build/win32/OSSREADME.json
+++ b/build/win32/OSSREADME.json
@@ -1,70 +1,4 @@
 [
-	{
-		"name": "dtolnay/isatty",
-		"version": "0.1.6",
-		"repositoryUrl": "https://github.com/dtolnay/isatty",
-		"licenseDetail": [
-			"Copyright (c) 2016",
-			"",
-			"Permission is hereby granted, free of charge, to any",
-			"person obtaining a copy of this software and associated",
-			"documentation files (the \"Software\"), to deal in the",
-			"Software without restriction, including without",
-			"limitation the rights to use, copy, modify, merge,",
-			"publish, distribute, sublicense, and/or sell copies of",
-			"the Software, and to permit persons to whom the Software",
-			"is furnished to do so, subject to the following",
-			"conditions:",
-			"",
-			"The above copyright notice and this permission notice",
-			"shall be included in all copies or substantial portions",
-			"of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
-			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
-			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
-			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
-			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
-			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
-			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
-			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
-			"DEALINGS IN THE SOFTWARE."
-		],
-		"isProd": true
-	},
-	{
-		"name": "rust-num/num-integer",
-		"version": "0.1.35",
-		"repositoryUrl": "https://github.com/rust-num/num-integer",
-		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
-			"",
-			"Permission is hereby granted, free of charge, to any",
-			"person obtaining a copy of this software and associated",
-			"documentation files (the \"Software\"), to deal in the",
-			"Software without restriction, including without",
-			"limitation the rights to use, copy, modify, merge,",
-			"publish, distribute, sublicense, and/or sell copies of",
-			"the Software, and to permit persons to whom the Software",
-			"is furnished to do so, subject to the following",
-			"conditions:",
-			"",
-			"The above copyright notice and this permission notice",
-			"shall be included in all copies or substantial portions",
-			"of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
-			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
-			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
-			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
-			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
-			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
-			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
-			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
-			"DEALINGS IN THE SOFTWARE."
-		],
-		"isProd": true
-	},
 	{
 		"name": "rust-lang-nursery/lazy-static.rs",
 		"version": "1.0.0",
@@ -99,9 +33,9 @@
 		"isProd": true
 	},
 	{
-		"name": "rust-lang/libc",
-		"version": "0.2.36",
-		"repositoryUrl": "https://github.com/rust-lang/libc",
+		"name": "rust-num/num",
+		"version": "0.1.41",
+		"repositoryUrl": "https://github.com/rust-num/num",
 		"licenseDetail": [
 			"Copyright (c) 2014 The Rust Project Developers",
 			"",
@@ -131,6 +65,39 @@
 		],
 		"isProd": true
 	},
+	{
+		"name": "dtolnay/isatty",
+		"version": "0.1.6",
+		"repositoryUrl": "https://github.com/dtolnay/isatty",
+		"licenseDetail": [
+			"Copyright (c) 2016",
+			"",
+			"Permission is hereby granted, free of charge, to any",
+			"person obtaining a copy of this software and associated",
+			"documentation files (the \"Software\"), to deal in the",
+			"Software without restriction, including without",
+			"limitation the rights to use, copy, modify, merge,",
+			"publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software",
+			"is furnished to do so, subject to the following",
+			"conditions:",
+			"",
+			"The above copyright notice and this permission notice",
+			"shall be included in all copies or substantial portions",
+			"of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
+			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
+			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
+			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
+			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
+			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
+			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
+			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
+			"DEALINGS IN THE SOFTWARE."
+		],
+		"isProd": true
+	},
 	{
 		"name": "retep998/winapi-rs",
 		"version": "0.2.2",
@@ -158,68 +125,6 @@
 		],
 		"isProd": true
 	},
-	{
-		"name": "mrhooray/crc-rs",
-		"version": "1.7.0",
-		"repositoryUrl": "https://github.com/mrhooray/crc-rs.git",
-		"licenseDetail": [
-			"MIT License",
-			"",
-			"Copyright (c) 2017 crc-rs Developers",
-			"",
-			"Permission is hereby granted, free of charge, to any person obtaining a copy",
-			"of this software and associated documentation files (the \"Software\"), to deal",
-			"in the Software without restriction, including without limitation the rights",
-			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
-			"copies of the Software, and to permit persons to whom the Software is",
-			"furnished to do so, subject to the following conditions:",
-			"",
-			"The above copyright notice and this permission notice shall be included in all",
-			"copies or substantial portions of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
-			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
-			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
-			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
-			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
-			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
-			"SOFTWARE."
-		],
-		"isProd": true
-	},
-	{
-		"name": "rust-num/num",
-		"version": "0.1.41",
-		"repositoryUrl": "https://github.com/rust-num/num",
-		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
-			"",
-			"Permission is hereby granted, free of charge, to any",
-			"person obtaining a copy of this software and associated",
-			"documentation files (the \"Software\"), to deal in the",
-			"Software without restriction, including without",
-			"limitation the rights to use, copy, modify, merge,",
-			"publish, distribute, sublicense, and/or sell copies of",
-			"the Software, and to permit persons to whom the Software",
-			"is furnished to do so, subject to the following",
-			"conditions:",
-			"",
-			"The above copyright notice and this permission notice",
-			"shall be included in all copies or substantial portions",
-			"of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
-			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
-			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
-			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
-			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
-			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
-			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
-			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
-			"DEALINGS IN THE SOFTWARE."
-		],
-		"isProd": true
-	},
 	{
 		"name": "BurntSushi/byteorder",
 		"version": "1.2.1",
@@ -250,9 +155,9 @@
 		"isProd": true
 	},
 	{
-		"name": "rust-num/num-traits",
-		"version": "0.1.42",
-		"repositoryUrl": "https://github.com/rust-num/num-traits",
+		"name": "rust-num/num-integer",
+		"version": "0.1.35",
+		"repositoryUrl": "https://github.com/rust-num/num-integer",
 		"licenseDetail": [
 			"Copyright (c) 2014 The Rust Project Developers",
 			"",
@@ -283,9 +188,71 @@
 		"isProd": true
 	},
 	{
-		"name": "slog-rs/slog",
-		"version": "2.1.1",
-		"repositoryUrl": "https://github.com/slog-rs/slog",
+		"name": "mrhooray/crc-rs",
+		"version": "1.7.0",
+		"repositoryUrl": "https://github.com/mrhooray/crc-rs.git",
+		"licenseDetail": [
+			"MIT License",
+			"",
+			"Copyright (c) 2017 crc-rs Developers",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy",
+			"of this software and associated documentation files (the \"Software\"), to deal",
+			"in the Software without restriction, including without limitation the rights",
+			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+			"copies of the Software, and to permit persons to whom the Software is",
+			"furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+			"SOFTWARE."
+		],
+		"isProd": true
+	},
+	{
+		"name": "rust-lang/libc",
+		"version": "0.2.36",
+		"repositoryUrl": "https://github.com/rust-lang/libc",
+		"licenseDetail": [
+			"Copyright (c) 2014 The Rust Project Developers",
+			"",
+			"Permission is hereby granted, free of charge, to any",
+			"person obtaining a copy of this software and associated",
+			"documentation files (the \"Software\"), to deal in the",
+			"Software without restriction, including without",
+			"limitation the rights to use, copy, modify, merge,",
+			"publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software",
+			"is furnished to do so, subject to the following",
+			"conditions:",
+			"",
+			"The above copyright notice and this permission notice",
+			"shall be included in all copies or substantial portions",
+			"of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
+			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
+			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
+			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
+			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
+			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
+			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
+			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
+			"DEALINGS IN THE SOFTWARE."
+		],
+		"isProd": true
+	},
+	{
+		"name": "rust-num/num-traits",
+		"version": "0.1.42",
+		"repositoryUrl": "https://github.com/rust-num/num-traits",
 		"licenseDetail": [
 			"Copyright (c) 2014 The Rust Project Developers",
 			"",
@@ -349,60 +316,35 @@
 		"isProd": true
 	},
 	{
-		"name": "vitiral/build_const",
-		"version": "0.2.0",
-		"repositoryUrl": "https://github.com/vitiral/build_const",
+		"name": "slog-rs/slog",
+		"version": "2.1.1",
+		"repositoryUrl": "https://github.com/slog-rs/slog",
 		"licenseDetail": [
-			"The MIT License (MIT)",
+			"Copyright (c) 2014 The Rust Project Developers",
 			"",
-			"Copyright (c) 2017 Garrett Berg, vitiral@gmail.com",
+			"Permission is hereby granted, free of charge, to any",
+			"person obtaining a copy of this software and associated",
+			"documentation files (the \"Software\"), to deal in the",
+			"Software without restriction, including without",
+			"limitation the rights to use, copy, modify, merge,",
+			"publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software",
+			"is furnished to do so, subject to the following",
+			"conditions:",
 			"",
-			"Permission is hereby granted, free of charge, to any person obtaining a copy",
-			"of this software and associated documentation files (the \"Software\"), to deal",
-			"in the Software without restriction, including without limitation the rights",
-			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
-			"copies of the Software, and to permit persons to whom the Software is",
-			"furnished to do so, subject to the following conditions:",
+			"The above copyright notice and this permission notice",
+			"shall be included in all copies or substantial portions",
+			"of the Software.",
 			"",
-			"The above copyright notice and this permission notice shall be included in",
-			"all copies or substantial portions of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
-			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
-			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
-			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
-			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
-			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN",
-			"THE SOFTWARE."
-		],
-		"isProd": true
-	},
-	{
-		"name": "redox-os/termios",
-		"version": "0.1.1",
-		"repositoryUrl": "https://github.com/redox-os/termios",
-		"licenseDetail": [
-			"MIT License",
-			"",
-			"Copyright (c) 2017 Redox OS",
-			"",
-			"Permission is hereby granted, free of charge, to any person obtaining a copy",
-			"of this software and associated documentation files (the \"Software\"), to deal",
-			"in the Software without restriction, including without limitation the rights",
-			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
-			"copies of the Software, and to permit persons to whom the Software is",
-			"furnished to do so, subject to the following conditions:",
-			"",
-			"The above copyright notice and this permission notice shall be included in all",
-			"copies or substantial portions of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
-			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
-			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
-			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
-			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
-			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
-			"SOFTWARE."
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
+			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
+			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
+			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
+			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
+			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
+			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
+			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
+			"DEALINGS IN THE SOFTWARE."
 		],
 		"isProd": true
 	},
@@ -469,6 +411,188 @@
 		],
 		"isProd": true
 	},
+	{
+		"name": "redox-os/termios",
+		"version": "0.1.1",
+		"repositoryUrl": "https://github.com/redox-os/termios",
+		"licenseDetail": [
+			"MIT License",
+			"",
+			"Copyright (c) 2017 Redox OS",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy",
+			"of this software and associated documentation files (the \"Software\"), to deal",
+			"in the Software without restriction, including without limitation the rights",
+			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+			"copies of the Software, and to permit persons to whom the Software is",
+			"furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+			"SOFTWARE."
+		],
+		"isProd": true
+	},
+	{
+		"name": "Sgeo/take_mut",
+		"version": "0.2.0",
+		"repositoryUrl": "https://github.com/Sgeo/take_mut",
+		"licenseDetail": [
+			"The MIT License (MIT)",
+			"",
+			"Copyright (c) 2016 Sgeo",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy",
+			"of this software and associated documentation files (the \"Software\"), to deal",
+			"in the Software without restriction, including without limitation the rights",
+			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+			"copies of the Software, and to permit persons to whom the Software is",
+			"furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+			"SOFTWARE."
+		],
+		"isProd": true
+	},
+	{
+		"name": "Amanieu/thread_local-rs",
+		"version": "0.3.5",
+		"repositoryUrl": "https://github.com/Amanieu/thread_local-rs",
+		"licenseDetail": [
+			"Copyright (c) 2016 The Rust Project Developers",
+			"",
+			"Permission is hereby granted, free of charge, to any",
+			"person obtaining a copy of this software and associated",
+			"documentation files (the \"Software\"), to deal in the",
+			"Software without restriction, including without",
+			"limitation the rights to use, copy, modify, merge,",
+			"publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software",
+			"is furnished to do so, subject to the following",
+			"conditions:",
+			"",
+			"The above copyright notice and this permission notice",
+			"shall be included in all copies or substantial portions",
+			"of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
+			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
+			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
+			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
+			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
+			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
+			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
+			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
+			"DEALINGS IN THE SOFTWARE."
+		],
+		"isProd": true
+	},
+	{
+		"name": "vitiral/build_const",
+		"version": "0.2.0",
+		"repositoryUrl": "https://github.com/vitiral/build_const",
+		"licenseDetail": [
+			"The MIT License (MIT)",
+			"",
+			"Copyright (c) 2017 Garrett Berg, vitiral@gmail.com",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy",
+			"of this software and associated documentation files (the \"Software\"), to deal",
+			"in the Software without restriction, including without limitation the rights",
+			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+			"copies of the Software, and to permit persons to whom the Software is",
+			"furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in",
+			"all copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN",
+			"THE SOFTWARE."
+		],
+		"isProd": true
+	},
+	{
+		"name": "ticki/termion",
+		"version": "1.5.1",
+		"repositoryUrl": "https://github.com/ticki/termion",
+		"licenseDetail": [
+			"The MIT License (MIT)",
+			"",
+			"Copyright (c) 2016 Ticki",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy",
+			"of this software and associated documentation files (the \"Software\"), to deal",
+			"in the Software without restriction, including without limitation the rights",
+			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+			"copies of the Software, and to permit persons to whom the Software is",
+			"furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+			"SOFTWARE."
+		],
+		"isProd": true
+	},
+	{
+		"name": "rust-lang/time",
+		"version": "0.1.39",
+		"repositoryUrl": "https://github.com/rust-lang/time",
+		"licenseDetail": [
+			"Copyright (c) 2014 The Rust Project Developers",
+			"",
+			"Permission is hereby granted, free of charge, to any",
+			"person obtaining a copy of this software and associated",
+			"documentation files (the \"Software\"), to deal in the",
+			"Software without restriction, including without",
+			"limitation the rights to use, copy, modify, merge,",
+			"publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software",
+			"is furnished to do so, subject to the following",
+			"conditions:",
+			"",
+			"The above copyright notice and this permission notice",
+			"shall be included in all copies or substantial portions",
+			"of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
+			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
+			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
+			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
+			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
+			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
+			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
+			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
+			"DEALINGS IN THE SOFTWARE."
+		],
+		"isProd": true
+	},
 	{
 		"name": "chronotope/chrono",
 		"version": "0.4.0",
@@ -716,95 +840,6 @@
 		],
 		"isProd": true
 	},
-	{
-		"name": "Amanieu/thread_local-rs",
-		"version": "0.3.5",
-		"repositoryUrl": "https://github.com/Amanieu/thread_local-rs",
-		"licenseDetail": [
-			"Copyright (c) 2016 The Rust Project Developers",
-			"",
-			"Permission is hereby granted, free of charge, to any",
-			"person obtaining a copy of this software and associated",
-			"documentation files (the \"Software\"), to deal in the",
-			"Software without restriction, including without",
-			"limitation the rights to use, copy, modify, merge,",
-			"publish, distribute, sublicense, and/or sell copies of",
-			"the Software, and to permit persons to whom the Software",
-			"is furnished to do so, subject to the following",
-			"conditions:",
-			"",
-			"The above copyright notice and this permission notice",
-			"shall be included in all copies or substantial portions",
-			"of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
-			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
-			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
-			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
-			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
-			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
-			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
-			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
-			"DEALINGS IN THE SOFTWARE."
-		],
-		"isProd": true
-	},
-	{
-		"name": "Sgeo/take_mut",
-		"version": "0.2.0",
-		"repositoryUrl": "https://github.com/Sgeo/take_mut",
-		"licenseDetail": [
-			"The MIT License (MIT)",
-			"",
-			"Copyright (c) 2016 Sgeo",
-			"",
-			"Permission is hereby granted, free of charge, to any person obtaining a copy",
-			"of this software and associated documentation files (the \"Software\"), to deal",
-			"in the Software without restriction, including without limitation the rights",
-			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
-			"copies of the Software, and to permit persons to whom the Software is",
-			"furnished to do so, subject to the following conditions:",
-			"",
-			"The above copyright notice and this permission notice shall be included in all",
-			"copies or substantial portions of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
-			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
-			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
-			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
-			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
-			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
-			"SOFTWARE."
-		],
-		"isProd": true
-	},
-	{
-		"name": "reem/rust-void",
-		"version": "1.0.2",
-		"repositoryUrl": "https://github.com/reem/rust-void.git",
-		"licenseDetail": [
-			"Copyright (c) 2015 The rust-void Developers",
-			"",
-			"Permission is hereby granted, free of charge, to any person obtaining a copy",
-			"of this software and associated documentation files (the \"Software\"), to deal",
-			"in the Software without restriction, including without limitation the rights",
-			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
-			"copies of the Software, and to permit persons to whom the Software is",
-			"furnished to do so, subject to the following conditions:",
-			"",
-			"The above copyright notice and this permission notice shall be included in all",
-			"copies or substantial portions of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
-			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
-			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
-			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
-			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
-			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
-			"SOFTWARE."
-		],
-		"isProd": true
-	},
 	{
 		"name": "reem/rust-unreachable",
 		"version": "1.0.0",
@@ -833,46 +868,38 @@
 		"isProd": true
 	},
 	{
-		"name": "rust-lang/time",
-		"version": "0.1.39",
-		"repositoryUrl": "https://github.com/rust-lang/time",
+		"name": "retep998/winapi-rs",
+		"version": "0.1.1",
+		"repositoryUrl": "https://github.com/retep998/winapi-rs",
 		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
+			"Copyright (c) 2015 The winapi-rs Developers",
 			"",
-			"Permission is hereby granted, free of charge, to any",
-			"person obtaining a copy of this software and associated",
-			"documentation files (the \"Software\"), to deal in the",
-			"Software without restriction, including without",
-			"limitation the rights to use, copy, modify, merge,",
-			"publish, distribute, sublicense, and/or sell copies of",
-			"the Software, and to permit persons to whom the Software",
-			"is furnished to do so, subject to the following",
-			"conditions:",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy",
+			"of this software and associated documentation files (the \"Software\"), to deal",
+			"in the Software without restriction, including without limitation the rights",
+			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+			"copies of the Software, and to permit persons to whom the Software is",
+			"furnished to do so, subject to the following conditions:",
 			"",
-			"The above copyright notice and this permission notice",
-			"shall be included in all copies or substantial portions",
-			"of the Software.",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
 			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
-			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
-			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
-			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
-			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
-			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
-			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
-			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
-			"DEALINGS IN THE SOFTWARE."
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+			"SOFTWARE."
 		],
 		"isProd": true
 	},
 	{
-		"name": "ticki/termion",
-		"version": "1.5.1",
-		"repositoryUrl": "https://github.com/ticki/termion",
+		"name": "reem/rust-void",
+		"version": "1.0.2",
+		"repositoryUrl": "https://github.com/reem/rust-void.git",
 		"licenseDetail": [
-			"The MIT License (MIT)",
-			"",
-			"Copyright (c) 2016 Ticki",
+			"Copyright (c) 2015 The rust-void Developers",
 			"",
 			"Permission is hereby granted, free of charge, to any person obtaining a copy",
 			"of this software and associated documentation files (the \"Software\"), to deal",
@@ -921,60 +948,6 @@
 		],
 		"isProd": true
 	},
-	{
-		"name": "retep998/winapi-rs",
-		"version": "0.3.4",
-		"repositoryUrl": "https://github.com/retep998/winapi-rs",
-		"licenseDetail": [
-			"Copyright (c) 2015 The winapi-rs Developers",
-			"",
-			"Permission is hereby granted, free of charge, to any person obtaining a copy",
-			"of this software and associated documentation files (the \"Software\"), to deal",
-			"in the Software without restriction, including without limitation the rights",
-			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
-			"copies of the Software, and to permit persons to whom the Software is",
-			"furnished to do so, subject to the following conditions:",
-			"",
-			"The above copyright notice and this permission notice shall be included in all",
-			"copies or substantial portions of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
-			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
-			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
-			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
-			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
-			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
-			"SOFTWARE."
-		],
-		"isProd": true
-	},
-	{
-		"name": "retep998/winapi-rs",
-		"version": "0.1.1",
-		"repositoryUrl": "https://github.com/retep998/winapi-rs",
-		"licenseDetail": [
-			"Copyright (c) 2015 The winapi-rs Developers",
-			"",
-			"Permission is hereby granted, free of charge, to any person obtaining a copy",
-			"of this software and associated documentation files (the \"Software\"), to deal",
-			"in the Software without restriction, including without limitation the rights",
-			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
-			"copies of the Software, and to permit persons to whom the Software is",
-			"furnished to do so, subject to the following conditions:",
-			"",
-			"The above copyright notice and this permission notice shall be included in all",
-			"copies or substantial portions of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
-			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
-			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
-			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
-			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
-			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
-			"SOFTWARE."
-		],
-		"isProd": true
-	},
 	{
 		"name": "retep998/winapi-rs",
 		"version": "0.4.0",
@@ -1002,6 +975,33 @@
 		],
 		"isProd": true
 	},
+	{
+		"name": "retep998/winapi-rs",
+		"version": "0.3.4",
+		"repositoryUrl": "https://github.com/retep998/winapi-rs",
+		"licenseDetail": [
+			"Copyright (c) 2015 The winapi-rs Developers",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy",
+			"of this software and associated documentation files (the \"Software\"), to deal",
+			"in the Software without restriction, including without limitation the rights",
+			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+			"copies of the Software, and to permit persons to whom the Software is",
+			"furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+			"SOFTWARE."
+		],
+		"isProd": true
+	},
 	{
 		"name": "retep998/winapi-rs",
 		"version": "0.4.0",
diff --git a/build/win32/inno_updater.exe b/build/win32/inno_updater.exe
index a896061751d..c216c404332 100755
Binary files a/build/win32/inno_updater.exe and b/build/win32/inno_updater.exe differ