diff --git a/autoconf/Makefile.msc b/autoconf/Makefile.msc
index 2f7447383f..d3bbc6b4d2 100644
--- a/autoconf/Makefile.msc
+++ b/autoconf/Makefile.msc
@@ -24,6 +24,13 @@ TOP = .
 USE_FULLWARN = 0
 !ENDIF
 
+# Set this non-0 to enable full runtime error checks (-RTC1, etc).  This
+# has no effect if (any) optimizations are enabled.
+#
+!IFNDEF USE_RUNTIME_CHECKS
+USE_RUNTIME_CHECKS = 0
+!ENDIF
+
 # Set this non-0 to use "stdcall" calling convention for the core library
 # and shell executable.
 #
@@ -740,6 +747,10 @@ RCC = $(RCC) -D_DEBUG
 !IF $(DEBUG)>1 || $(OPTIMIZATIONS)==0
 TCC = $(TCC) -Od
 BCC = $(BCC) -Od
+!IF $(USE_RUNTIME_CHECKS)!=0
+TCC = $(TCC) -RTC1
+BCC = $(BCC) -RTC1
+!ENDIF
 !ELSEIF $(OPTIMIZATIONS)>=3
 TCC = $(TCC) -Ox
 BCC = $(BCC) -Ox
diff --git a/manifest b/manifest
index 8c17c25796..da1d23e9ba 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\srefinement\sto\sthe\scalling\sconvention\smacros.
-D 2016-07-29T01:49:36.961
+C Merge\sadditional\slinkage\smacro\schanges\sfrom\sthe\sbranch.
+D 2016-07-29T01:55:42.841
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 3340e479e5221f06c3d61726f8f7efff885e4233
@@ -11,7 +11,7 @@ F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am 1a47d071e3d5435f8f7ebff7eb6703848bbd65d4
-F autoconf/Makefile.msc 05a99e98a8895461574ccb9604444d9e97c1f0b6
+F autoconf/Makefile.msc 7a909aa9b538138a21c0626e3ffc4b1f4519f50e
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
 F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1
 F autoconf/configure.ac cacf2616abf6e4a569bde2ef365c143caeec40bc
@@ -1508,7 +1508,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c7d51934a4f30d096bb79fc509fc9dd0df5d89a4 bc8c9b55ddf5227dc6b2116486f4a19bf54fce2b
-R 554600d1ca55e9b4c82a4274bcc372e8
+P 45588de385d2a721b3e9f04beb6c7b789dd27d42 71ffa195f5a48280ee522d80ab82e8cdea636961
+R 092b06ead5aa5690fab5536515621278
+T +closed 71ffa195f5a48280ee522d80ab82e8cdea636961
 U drh
-Z 5b5bfebf7f52a37872ab26a1ec1320c2
+Z 3d26d07289768bac8aea9d48f7d64298
diff --git a/manifest.uuid b/manifest.uuid
index c200ec2ab6..e13e9140e9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-45588de385d2a721b3e9f04beb6c7b789dd27d42
\ No newline at end of file
+8b0eb22ee12b23421dcb8dbeb46909d813788a0b
\ No newline at end of file