Version fixes

55 files changed, 180 insertions, 180 deletions

diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml
index 6cfed6c142f..b87c8252c22 100644
--- a/cpp/config/templates.xml
+++ b/cpp/config/templates.xml
@@ -59,7 +59,7 @@
       <parameter name="publish-endpoints" default="default"/>
       <parameter name="flush-timeout" default="1000"/>
 
-      <service name="${instance-name}" entry="IceStormService,36:createIceStorm">
+      <service name="${instance-name}" entry="IceStormService,36b:createIceStorm">
 
         <dbenv name="${service}"/>
 
@@ -111,7 +111,7 @@
       <parameter name="publish-replica-group"/>
       <parameter name="topic-manager-replica-group"/>
 
-      <service name="${instance-name}${node-id}" entry="IceStormService,36:createIceStorm">
+      <service name="${instance-name}${node-id}" entry="IceStormService,36b:createIceStorm">
 
         <dbenv name="${service}"/>
 
diff --git a/cpp/demo/Glacier2/winrt/chat/chat-8.1.vcxproj b/cpp/demo/Glacier2/winrt/chat/chat-8.1.vcxproj
index e840e6006a6..fbb5d13125f 100644
--- a/cpp/demo/Glacier2/winrt/chat/chat-8.1.vcxproj
+++ b/cpp/demo/Glacier2/winrt/chat/chat-8.1.vcxproj
@@ -232,7 +232,7 @@
     <Text Include="README.txt" />
   </ItemGroup>
   <ItemGroup>
-    <SDKReference Include="Ice, Version=3.5" />
+    <SDKReference Include="Ice, Version=3.6" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/cpp/demo/Glacier2/winrt/chat/chat.vcxproj b/cpp/demo/Glacier2/winrt/chat/chat.vcxproj
index 253d2153d9c..d90a662e76f 100644
--- a/cpp/demo/Glacier2/winrt/chat/chat.vcxproj
+++ b/cpp/demo/Glacier2/winrt/chat/chat.vcxproj
@@ -73,27 +73,27 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -231,7 +231,7 @@
     <Text Include="README.txt" />
   </ItemGroup>
   <ItemGroup>
-    <SDKReference Include="Ice, Version=3.5" />
+    <SDKReference Include="Ice, Version=3.6" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/cpp/demo/Ice/MFC/client/HelloClient.rc b/cpp/demo/Ice/MFC/client/HelloClient.rc
index 5a349283a8e..6151f1a0bd9 100755
--- a/cpp/demo/Ice/MFC/client/HelloClient.rc
+++ b/cpp/demo/Ice/MFC/client/HelloClient.rc
@@ -119,12 +119,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc."
             VALUE "FileDescription", "Ice Hello Client"
-            VALUE "FileVersion", "3.6.51"
+            VALUE "FileVersion", "3.6b"
             VALUE "InternalName", "HelloClient.exe"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved."
             VALUE "OriginalFilename", "HelloClient.exe"
             VALUE "ProductName", "Ice"
-            VALUE "ProductVersion", "3.6.51"
+            VALUE "ProductVersion", "3.6b"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/demo/Ice/MFC/server/HelloServer.rc b/cpp/demo/Ice/MFC/server/HelloServer.rc
index 31e11e30f19..93c389cb49f 100644
--- a/cpp/demo/Ice/MFC/server/HelloServer.rc
+++ b/cpp/demo/Ice/MFC/server/HelloServer.rc
@@ -110,12 +110,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Ice Hello Server\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "HelloServer.exe\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "HelloServer.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/demo/Ice/winrt/bidir/bidir-8.1.vcxproj b/cpp/demo/Ice/winrt/bidir/bidir-8.1.vcxproj
index 54b11232252..d3a2f31c5fd 100644
--- a/cpp/demo/Ice/winrt/bidir/bidir-8.1.vcxproj
+++ b/cpp/demo/Ice/winrt/bidir/bidir-8.1.vcxproj
@@ -211,7 +211,7 @@
     <Text Include="README.txt" />
   </ItemGroup>
   <ItemGroup>
-    <SDKReference Include="Ice, Version=3.5" />
+    <SDKReference Include="Ice, Version=3.6" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/cpp/demo/Ice/winrt/bidir/bidir.vcxproj b/cpp/demo/Ice/winrt/bidir/bidir.vcxproj
index 82263dc00ed..33e52d165ea 100644
--- a/cpp/demo/Ice/winrt/bidir/bidir.vcxproj
+++ b/cpp/demo/Ice/winrt/bidir/bidir.vcxproj
@@ -73,27 +73,27 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -210,7 +210,7 @@
     <Text Include="README.txt" />
   </ItemGroup>
   <ItemGroup>
-    <SDKReference Include="Ice, Version=3.5" />
+    <SDKReference Include="Ice, Version=3.6" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/cpp/demo/Ice/winrt/hello/hello-8.1.vcxproj b/cpp/demo/Ice/winrt/hello/hello-8.1.vcxproj
index 2259bdb15c6..88eae48277e 100644
--- a/cpp/demo/Ice/winrt/hello/hello-8.1.vcxproj
+++ b/cpp/demo/Ice/winrt/hello/hello-8.1.vcxproj
@@ -214,7 +214,7 @@
     <Text Include="README.txt" />
   </ItemGroup>
   <ItemGroup>
-    <SDKReference Include="Ice, Version=3.5" />
+    <SDKReference Include="Ice, Version=3.6" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/cpp/demo/Ice/winrt/hello/hello.vcxproj b/cpp/demo/Ice/winrt/hello/hello.vcxproj
index 3c32d2c9cc1..647b9031742 100644
--- a/cpp/demo/Ice/winrt/hello/hello.vcxproj
+++ b/cpp/demo/Ice/winrt/hello/hello.vcxproj
@@ -73,27 +73,27 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -213,7 +213,7 @@
     <Text Include="README.txt" />
   </ItemGroup>
   <ItemGroup>
-    <SDKReference Include="Ice, Version=3.5" />
+    <SDKReference Include="Ice, Version=3.6" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/cpp/demo/IcePatch2/MFC/PatchClient.rc b/cpp/demo/IcePatch2/MFC/PatchClient.rc
index 4c4b6f2c817..5b12925a0e3 100644
--- a/cpp/demo/IcePatch2/MFC/PatchClient.rc
+++ b/cpp/demo/IcePatch2/MFC/PatchClient.rc
@@ -136,12 +136,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Ice Patch Client\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "PatchClient.exe\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "PatchClient.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/doc/swish/swish.conf b/cpp/doc/swish/swish.conf
index 57d90010f5f..1272b85997d 100644
--- a/cpp/doc/swish/swish.conf
+++ b/cpp/doc/swish/swish.conf
@@ -1,6 +1,6 @@
 Replacerules remove /var/www/html/
-IndexDir /var/www/html/doc/Ice-3.6.51/reference
-IndexDir /var/www/html/doc/Ice-3.6.51/manual
+IndexDir /var/www/html/doc/Ice-3.6b/reference
+IndexDir /var/www/html/doc/Ice-3.6b/manual
 IndexOnly .html
 FileRules filename is _sindex\.html
 DefaultContents HTML*
diff --git a/cpp/doc/swish/swishcgi.conf b/cpp/doc/swish/swishcgi.conf
index 51a06701b14..8ab0086ccec 100644
--- a/cpp/doc/swish/swishcgi.conf
+++ b/cpp/doc/swish/swishcgi.conf
@@ -1,6 +1,6 @@
 use lib '/var/www/html/doc/swishdir';
 
-my $ice_version = '3.6.51';
+my $ice_version = '3.6b';
 my $suffix = '-IceTouch';
 
 my $referer = $ENV{HTTP_REFERER} ? $ENV{HTTP_REFERER} : '';
diff --git a/cpp/src/Freeze/Freeze.rc b/cpp/src/Freeze/Freeze.rc
index d166e058d8d..2437d63ea68 100644
--- a/cpp/src/Freeze/Freeze.rc
+++ b/cpp/src/Freeze/Freeze.rc
@@ -6,12 +6,12 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "freeze36d\0"
- #define ORIGINALFILENAME "freeze36d.dll\0"
+ #define INTERNALNAME "freeze36bd\0"
+ #define ORIGINALFILENAME "freeze36bd.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "freeze36\0"
- #define ORIGINALFILENAME "freeze36.dll\0"
+ #define INTERNALNAME "freeze36b\0"
+ #define ORIGINALFILENAME "freeze36b.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Freeze DLL\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/FreezeScript/DumpDB.rc b/cpp/src/FreezeScript/DumpDB.rc
index fbfcefd4b89..16810bb5071 100644
--- a/cpp/src/FreezeScript/DumpDB.rc
+++ b/cpp/src/FreezeScript/DumpDB.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Dump Database\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "dumpdb\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "dumpdb.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/FreezeScript/TransformDB.rc b/cpp/src/FreezeScript/TransformDB.rc
index ea44263688c..607f41028f6 100644
--- a/cpp/src/FreezeScript/TransformDB.rc
+++ b/cpp/src/FreezeScript/TransformDB.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Transform Database\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "transformdb\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "transformdb.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Glacier2/Glacier2Router.rc b/cpp/src/Glacier2/Glacier2Router.rc
index 7fecca6846e..4e999586ff8 100644
--- a/cpp/src/Glacier2/Glacier2Router.rc
+++ b/cpp/src/Glacier2/Glacier2Router.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Glacier2 Router\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "glacier2router\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "glacier2router.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc
index a7b9ab79bcc..5e31f991930 100644
--- a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Glacier2CryptPermissionsVerifier DLL\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Glacier2Lib/Glacier2.rc b/cpp/src/Glacier2Lib/Glacier2.rc
index 89724b77481..3c90a19e0cf 100644
--- a/cpp/src/Glacier2Lib/Glacier2.rc
+++ b/cpp/src/Glacier2Lib/Glacier2.rc
@@ -6,12 +6,12 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "glacier236d\0"
- #define ORIGINALFILENAME "glacier236d.dll\0"
+ #define INTERNALNAME "glacier236bd\0"
+ #define ORIGINALFILENAME "glacier236bd.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "glacier236\0"
- #define ORIGINALFILENAME "glacier236.dll\0"
+ #define INTERNALNAME "glacier236b\0"
+ #define ORIGINALFILENAME "glacier236b.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Glacier2 DLL\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Ice/Ice.rc b/cpp/src/Ice/Ice.rc
index 892d71fb326..40a9e24390c 100644
--- a/cpp/src/Ice/Ice.rc
+++ b/cpp/src/Ice/Ice.rc
@@ -7,12 +7,12 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "ice36d\0"
- #define ORIGINALFILENAME "ice36d.dll\0"
+ #define INTERNALNAME "ice36bd\0"
+ #define ORIGINALFILENAME "ice36bd.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "ice36\0"
- #define ORIGINALFILENAME "ice36.dll\0"
+ #define INTERNALNAME "ice36b\0"
+ #define ORIGINALFILENAME "ice36b.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -24,12 +24,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Ice Core DLL\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBox.rc b/cpp/src/IceBox/IceBox.rc
index cf65b4b030e..cc48495357e 100644
--- a/cpp/src/IceBox/IceBox.rc
+++ b/cpp/src/IceBox/IceBox.rc
@@ -6,12 +6,12 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icebox36d\0"
- #define ORIGINALFILENAME "icebox36d.dll\0"
+ #define INTERNALNAME "icebox36bd\0"
+ #define ORIGINALFILENAME "icebox36bd.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icebox36\0"
- #define ORIGINALFILENAME "icebox36.dll\0"
+ #define INTERNALNAME "icebox36b\0"
+ #define ORIGINALFILENAME "icebox36b.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceBox DLL\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBoxAdmin.rc b/cpp/src/IceBox/IceBoxAdmin.rc
index b81931378f8..bf89b17c9ba 100644
--- a/cpp/src/IceBox/IceBoxAdmin.rc
+++ b/cpp/src/IceBox/IceBoxAdmin.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceBox Admin\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "iceboxadmin\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "iceboxadmin.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBoxExe.rc b/cpp/src/IceBox/IceBoxExe.rc
index f937ffb4244..8cb77103d52 100644
--- a/cpp/src/IceBox/IceBoxExe.rc
+++ b/cpp/src/IceBox/IceBoxExe.rc
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceBox\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceDiscovery/IceDiscovery.rc b/cpp/src/IceDiscovery/IceDiscovery.rc
index 6e9631a078f..8013d67d5a4 100755
--- a/cpp/src/IceDiscovery/IceDiscovery.rc
+++ b/cpp/src/IceDiscovery/IceDiscovery.rc
@@ -6,12 +6,12 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icediscovery36d\0"
- #define ORIGINALFILENAME "icediscovery36d.dll\0"
+ #define INTERNALNAME "icediscovery36bd\0"
+ #define ORIGINALFILENAME "icediscovery36bd.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icediscovery36\0"
- #define ORIGINALFILENAME "icediscovery36.dll\0"
+ #define INTERNALNAME "icediscovery36b\0"
+ #define ORIGINALFILENAME "icediscovery36b.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Ice Discovery DLL\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridAdmin.rc b/cpp/src/IceGrid/IceGridAdmin.rc
index b394665d3cc..e1ba2c21b41 100644
--- a/cpp/src/IceGrid/IceGridAdmin.rc
+++ b/cpp/src/IceGrid/IceGridAdmin.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid Admin\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "icegridadmin\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "icegridadmin.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridNode.rc b/cpp/src/IceGrid/IceGridNode.rc
index a0cfcc1eaa1..96e52eff7c0 100644
--- a/cpp/src/IceGrid/IceGridNode.rc
+++ b/cpp/src/IceGrid/IceGridNode.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid Node\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "icegridnode\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "icegridnode.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridRegistry.rc b/cpp/src/IceGrid/IceGridRegistry.rc
index a9d3404e46a..e4372dff15c 100644
--- a/cpp/src/IceGrid/IceGridRegistry.rc
+++ b/cpp/src/IceGrid/IceGridRegistry.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid Registry\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "icegridregistry\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "icegridregistry.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGridLib/IceGrid.rc b/cpp/src/IceGridLib/IceGrid.rc
index cf01132c31b..c09ced626be 100644
--- a/cpp/src/IceGridLib/IceGrid.rc
+++ b/cpp/src/IceGridLib/IceGrid.rc
@@ -6,12 +6,12 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icegrid36d\0"
- #define ORIGINALFILENAME "icegrid36d.dll\0"
+ #define INTERNALNAME "icegrid36bd\0"
+ #define ORIGINALFILENAME "icegrid36bd.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icegrid36\0"
- #define ORIGINALFILENAME "icegrid36.dll\0"
+ #define INTERNALNAME "icegrid36b\0"
+ #define ORIGINALFILENAME "icegrid36b.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid DLL\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Calc.rc b/cpp/src/IcePatch2/IcePatch2Calc.rc
index 38ad80d9d91..27c57b37fe2 100644
--- a/cpp/src/IcePatch2/IcePatch2Calc.rc
+++ b/cpp/src/IcePatch2/IcePatch2Calc.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IcePatch2 Calc\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "icepatch2calc\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "icepatch2calc.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Client.rc b/cpp/src/IcePatch2/IcePatch2Client.rc
index 4a6a7d63615..b4b5983d490 100644
--- a/cpp/src/IcePatch2/IcePatch2Client.rc
+++ b/cpp/src/IcePatch2/IcePatch2Client.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IcePatch2 Client\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "icepatch2client\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "icepatch2client.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Server.rc b/cpp/src/IcePatch2/IcePatch2Server.rc
index 71324c01b8b..008590478c2 100644
--- a/cpp/src/IcePatch2/IcePatch2Server.rc
+++ b/cpp/src/IcePatch2/IcePatch2Server.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IcePatch2 Server\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "icepatch2server\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "icepatch2server.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2Lib/IcePatch2.rc b/cpp/src/IcePatch2Lib/IcePatch2.rc
index 8e4cdbbab5b..ce3ae8bf082 100644
--- a/cpp/src/IcePatch2Lib/IcePatch2.rc
+++ b/cpp/src/IcePatch2Lib/IcePatch2.rc
@@ -6,12 +6,12 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icepatch236d\0"
- #define ORIGINALFILENAME "icepatch236d.dll\0"
+ #define INTERNALNAME "icepatch236bd\0"
+ #define ORIGINALFILENAME "icepatch236bd.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icepatch236\0"
- #define ORIGINALFILENAME "icepatch236.dll\0"
+ #define INTERNALNAME "icepatch236b\0"
+ #define ORIGINALFILENAME "icepatch236b.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IcePatch2 DLL\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceSSL/IceSSL.rc b/cpp/src/IceSSL/IceSSL.rc
index ac721ac15a8..165cc5d5040 100644
--- a/cpp/src/IceSSL/IceSSL.rc
+++ b/cpp/src/IceSSL/IceSSL.rc
@@ -6,12 +6,12 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icessl36d\0"
- #define ORIGINALFILENAME "icessl36d.dll\0"
+ #define INTERNALNAME "icessl36bd\0"
+ #define ORIGINALFILENAME "icessl36bd.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icessl36\0"
- #define ORIGINALFILENAME "icessl36.dll\0"
+ #define INTERNALNAME "icessl36b\0"
+ #define ORIGINALFILENAME "icessl36b.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceSSL DLL\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormAdmin.rc b/cpp/src/IceStorm/IceStormAdmin.rc
index a761238fc42..c137dcaf261 100644
--- a/cpp/src/IceStorm/IceStormAdmin.rc
+++ b/cpp/src/IceStorm/IceStormAdmin.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm Admin\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "icestormadmin\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "icestormadmin.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormDB.rc b/cpp/src/IceStorm/IceStormDB.rc
index ef628a9917c..529edc03b3b 100644
--- a/cpp/src/IceStorm/IceStormDB.rc
+++ b/cpp/src/IceStorm/IceStormDB.rc
@@ -6,12 +6,12 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormdb36d\0"
- #define ORIGINALFILENAME "icestormdb36d.dll\0"
+ #define INTERNALNAME "icestormdb36bd\0"
+ #define ORIGINALFILENAME "icestormdb36bd.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icestormdb36\0"
- #define ORIGINALFILENAME "icestormdb36.dll\0"
+ #define INTERNALNAME "icestormdb36b\0"
+ #define ORIGINALFILENAME "icestormdb36b.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm DB DLL\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormMigrate.rc b/cpp/src/IceStorm/IceStormMigrate.rc
index da6d915ee40..2a65cd36e0d 100644
--- a/cpp/src/IceStorm/IceStormMigrate.rc
+++ b/cpp/src/IceStorm/IceStormMigrate.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm Migrate\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "icestormmigrate\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "icestormmigrate.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormService.rc b/cpp/src/IceStorm/IceStormService.rc
index 8741de8cbc6..f5aae9c7c4b 100644
--- a/cpp/src/IceStorm/IceStormService.rc
+++ b/cpp/src/IceStorm/IceStormService.rc
@@ -6,12 +6,12 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormservice36d\0"
- #define ORIGINALFILENAME "icestormservice36d.dll\0"
+ #define INTERNALNAME "icestormservice36bd\0"
+ #define ORIGINALFILENAME "icestormservice36bd.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icestormservice36\0"
- #define ORIGINALFILENAME "icestormservice36.dll\0"
+ #define INTERNALNAME "icestormservice36b\0"
+ #define ORIGINALFILENAME "icestormservice36b.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm Service DLL\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStormLib/IceStorm.rc b/cpp/src/IceStormLib/IceStorm.rc
index f525f38c54e..e10272cd901 100644
--- a/cpp/src/IceStormLib/IceStorm.rc
+++ b/cpp/src/IceStormLib/IceStorm.rc
@@ -6,12 +6,12 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestorm36d\0"
- #define ORIGINALFILENAME "icestorm36d.dll\0"
+ #define INTERNALNAME "icestorm36bd\0"
+ #define ORIGINALFILENAME "icestorm36bd.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icestorm36\0"
- #define ORIGINALFILENAME "icestorm36.dll\0"
+ #define INTERNALNAME "icestorm36b\0"
+ #define ORIGINALFILENAME "icestorm36b.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm DLL\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceUtil/IceUtil.rc b/cpp/src/IceUtil/IceUtil.rc
index f79c945947b..a98538c8494 100644
--- a/cpp/src/IceUtil/IceUtil.rc
+++ b/cpp/src/IceUtil/IceUtil.rc
@@ -6,12 +6,12 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "iceutil36d\0"
- #define ORIGINALFILENAME "iceutil36d.dll\0"
+ #define INTERNALNAME "iceutil36bd\0"
+ #define ORIGINALFILENAME "iceutil36bd.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "iceutil36\0"
- #define ORIGINALFILENAME "iceutil36.dll\0"
+ #define INTERNALNAME "iceutil36b\0"
+ #define ORIGINALFILENAME "iceutil36b.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Ice Utilities DLL\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceXML/IceXML.rc b/cpp/src/IceXML/IceXML.rc
index 63b51f3283d..7686614e016 100644
--- a/cpp/src/IceXML/IceXML.rc
+++ b/cpp/src/IceXML/IceXML.rc
@@ -6,12 +6,12 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icexml36d\0"
- #define ORIGINALFILENAME "icexml36d.dll\0"
+ #define INTERNALNAME "icexml36bd\0"
+ #define ORIGINALFILENAME "icexml36bd.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icexml36\0"
- #define ORIGINALFILENAME "icexml36.dll\0"
+ #define INTERNALNAME "icexml36b\0"
+ #define ORIGINALFILENAME "icexml36b.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceXML DLL\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Slice/Slice.rc b/cpp/src/Slice/Slice.rc
index 0608f63aafd..c0c61b318c6 100644
--- a/cpp/src/Slice/Slice.rc
+++ b/cpp/src/Slice/Slice.rc
@@ -6,12 +6,12 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "slice36d\0"
- #define ORIGINALFILENAME "slice36d.dll\0"
+ #define INTERNALNAME "slice36bd\0"
+ #define ORIGINALFILENAME "slice36bd.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "slice36\0"
- #define ORIGINALFILENAME "slice36.dll\0"
+ #define INTERNALNAME "slice36b\0"
+ #define ORIGINALFILENAME "slice36b.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice Utilities DLL\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/ca/iceca b/cpp/src/ca/iceca
index c5202052a90..1c5b21b8214 100755
--- a/cpp/src/ca/iceca
+++ b/cpp/src/ca/iceca
@@ -118,7 +118,7 @@ if sys.argv[script] == "import":
         checkLocations = [".", 
                           os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..", "lib")),
                           os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..", "..", "lib")),
-                          "/usr/share/Ice-3.6.51"]
+                          "/usr/share/Ice-3.6b"]
         for bindir in checkLocations:
             bindir = os.path.normpath(bindir)
             if os.path.exists(os.path.join(bindir, "ImportKey.class")):
diff --git a/cpp/src/iceserviceinstall/IceServiceInstall.rc b/cpp/src/iceserviceinstall/IceServiceInstall.rc
index 3a491560937..5fa156f4892 100644
--- a/cpp/src/iceserviceinstall/IceServiceInstall.rc
+++ b/cpp/src/iceserviceinstall/IceServiceInstall.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Service Installer\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "iceserviceinstall\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "iceserviceinstall.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2confluence/Slice2Confluence.rc b/cpp/src/slice2confluence/Slice2Confluence.rc
index 61441721e1a..13a561156a4 100644
--- a/cpp/src/slice2confluence/Slice2Confluence.rc
+++ b/cpp/src/slice2confluence/Slice2Confluence.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To Confluence Markup Translator\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "slice2confluence\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2confluence.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2cpp/Slice2Cpp.rc b/cpp/src/slice2cpp/Slice2Cpp.rc
index b8c4a81990d..e2d7ecdf7f5 100644
--- a/cpp/src/slice2cpp/Slice2Cpp.rc
+++ b/cpp/src/slice2cpp/Slice2Cpp.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To C++ Translator\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "slice2cpp\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2cpp.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2cs/Slice2Cs.rc b/cpp/src/slice2cs/Slice2Cs.rc
index a17225d7b07..a5c380f3dbc 100644
--- a/cpp/src/slice2cs/Slice2Cs.rc
+++ b/cpp/src/slice2cs/Slice2Cs.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To C# Translator\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "slice2cs\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2cs.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2freeze/Slice2Freeze.rc b/cpp/src/slice2freeze/Slice2Freeze.rc
index 21855c6583c..225ff9e50c6 100644
--- a/cpp/src/slice2freeze/Slice2Freeze.rc
+++ b/cpp/src/slice2freeze/Slice2Freeze.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To Freeze Translator\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "slice2freeze\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2freeze.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2freezej/Slice2FreezeJ.rc b/cpp/src/slice2freezej/Slice2FreezeJ.rc
index 7651683659a..222e0c4a22e 100644
--- a/cpp/src/slice2freezej/Slice2FreezeJ.rc
+++ b/cpp/src/slice2freezej/Slice2FreezeJ.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To Freeze for Java Translator\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "slice2freezej\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2freezej.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2html/Slice2Html.rc b/cpp/src/slice2html/Slice2Html.rc
index 9b2bd34f836..1a169ed4e54 100644
--- a/cpp/src/slice2html/Slice2Html.rc
+++ b/cpp/src/slice2html/Slice2Html.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To HTML Translator\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "slice2html\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2html.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2java/Slice2Java.rc b/cpp/src/slice2java/Slice2Java.rc
index 1285929f80d..c9fc778b076 100644
--- a/cpp/src/slice2java/Slice2Java.rc
+++ b/cpp/src/slice2java/Slice2Java.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To Java Translator\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "slice2java\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2java.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2js/Slice2Js.rc b/cpp/src/slice2js/Slice2Js.rc
index d0d6f893e57..9f2cf2aacd8 100644
--- a/cpp/src/slice2js/Slice2Js.rc
+++ b/cpp/src/slice2js/Slice2Js.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To JavaScript Translator\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "slice2js\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2js.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2php/Slice2PHP.rc b/cpp/src/slice2php/Slice2PHP.rc
index 18c4514a0df..c580612d296 100644
--- a/cpp/src/slice2php/Slice2PHP.rc
+++ b/cpp/src/slice2php/Slice2PHP.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To Python Translator\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "slice2py\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2py.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2py/Slice2Py.rc b/cpp/src/slice2py/Slice2Py.rc
index 18c4514a0df..c580612d296 100644
--- a/cpp/src/slice2py/Slice2Py.rc
+++ b/cpp/src/slice2py/Slice2Py.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To Python Translator\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "slice2py\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2py.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2rb/Slice2Rb.rc b/cpp/src/slice2rb/Slice2Rb.rc
index 86e158affcf..132c53eeb4d 100644
--- a/cpp/src/slice2rb/Slice2Rb.rc
+++ b/cpp/src/slice2rb/Slice2Rb.rc
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To Ruby Translator\0"
-            VALUE "FileVersion", "3.6.51\0"
+            VALUE "FileVersion", "3.6b\0"
             VALUE "InternalName", "slice2rb\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2rb.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.51\0"
+            VALUE "ProductVersion", "3.6b\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/test/IceStorm/repgrid/application.xml b/cpp/test/IceStorm/repgrid/application.xml
index cbfdeb0acaa..80f31d6fb51 100644
--- a/cpp/test/IceStorm/repgrid/application.xml
+++ b/cpp/test/IceStorm/repgrid/application.xml
@@ -28,7 +28,7 @@
       <parameter name="publish-replica-group"/>
       <parameter name="topic-manager-replica-group"/>
 
-      <service name="${instance-name}${node-id}" entry="IceStormService,36:createIceStorm">
+      <service name="${instance-name}${node-id}" entry="IceStormService,36b:createIceStorm">
 
         <dbenv name="${service}"/>
 
diff --git a/cpp/test/WinRT/TestSuite/TestSuite.vcxproj b/cpp/test/WinRT/TestSuite/TestSuite.vcxproj
index 936ab032945..e826de5f680 100644
--- a/cpp/test/WinRT/TestSuite/TestSuite.vcxproj
+++ b/cpp/test/WinRT/TestSuite/TestSuite.vcxproj
@@ -73,27 +73,27 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.5@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -401,7 +401,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <SDKReference Include="Ice, Version=3.5" />
+    <SDKReference Include="Ice, Version=3.6" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">