Update Ice version to 3.6.3

76 files changed, 229 insertions, 229 deletions

diff --git a/android/gradle.properties b/android/gradle.properties
index b74338956ff..f7d562ad96a 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-iceVersion = 3.6.2
+iceVersion = 3.6.3
 
 // The Android versions used for the Ice build.
 ice_buildToolsVersion = 21.1.1
diff --git a/config/Make.common.rules b/config/Make.common.rules
index 4e742f9ee26..d407d2303e2 100644
--- a/config/Make.common.rules
+++ b/config/Make.common.rules
@@ -14,8 +14,8 @@
 SHELL		= /bin/sh
 VERSION_MAJOR   = 3
 VERSION_MINOR   = 6
-VERSION_PATCH   = 2
-VERSION         = 3.6.2
+VERSION_PATCH   = 3
+VERSION         = 3.6.3
 SHORT_VERSION   = 3.6
 SOVERSION	= 36
 
diff --git a/config/Make.common.rules.mak b/config/Make.common.rules.mak
index a1ff76bc50f..3238ced9b67 100644
--- a/config/Make.common.rules.mak
+++ b/config/Make.common.rules.mak
@@ -12,10 +12,10 @@
 # ----------------------------------------------------------------------
 
 SHELL		= /bin/sh
-VERSION         = 3.6.2
-INTVERSION      = 3.6.2
+VERSION         = 3.6.3
+INTVERSION      = 3.6.3
 SHORT_VERSION   = 3.6
-PATCH_VERSION   = 2
+PATCH_VERSION   = 3
 SOVERSION       = 36
 
 OBJEXT		= .obj
diff --git a/cpp/config/Ice.props b/cpp/config/Ice.props
index fa8e37de99d..ac5ef622c19 100644
--- a/cpp/config/Ice.props
+++ b/cpp/config/Ice.props
@@ -3,8 +3,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup Label="IceHome" Condition="'$(ICE_HOME)' != ''">
         <IceHome>$(ICE_HOME)</IceHome>
-        <IceVersion>3.6.2</IceVersion>
-        <IceIntVersion>30602</IceIntVersion>
+        <IceVersion>3.6.3</IceVersion>
+        <IceIntVersion>30603</IceIntVersion>
         <IceVersionMM>3.6</IceVersionMM>
     </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 30afc768892..c70f6350a77 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -239,7 +239,7 @@ typedef long long Int64;
 //
 // The Ice version.
 //
-#define ICE_STRING_VERSION "3.6.2" // "A.B.C", with A=major, B=minor, C=patch
-#define ICE_INT_VERSION 30602      // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICE_STRING_VERSION "3.6.3" // "A.B.C", with A=major, B=minor, C=patch
+#define ICE_INT_VERSION 30603      // AABBCC, with AA=major, BB=minor, CC=patch
 
 #endif
diff --git a/cpp/src/Freeze/Freeze.rc b/cpp/src/Freeze/Freeze.rc
index 16423321cad..87bb7d60a4f 100644
--- a/cpp/src/Freeze/Freeze.rc
+++ b/cpp/src/Freeze/Freeze.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Freeze C++ Library\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/FreezeScript/DumpDB.rc b/cpp/src/FreezeScript/DumpDB.rc
index 86b833edaab..219a374dbe3 100644
--- a/cpp/src/FreezeScript/DumpDB.rc
+++ b/cpp/src/FreezeScript/DumpDB.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Dump Freeze Database\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "dumpdb\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "dumpdb.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/FreezeScript/TransformDB.rc b/cpp/src/FreezeScript/TransformDB.rc
index a3d69395884..9fcc0eff244 100644
--- a/cpp/src/FreezeScript/TransformDB.rc
+++ b/cpp/src/FreezeScript/TransformDB.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Transform Freeze Database\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "transformdb\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "transformdb.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Glacier2/Glacier2Router.rc b/cpp/src/Glacier2/Glacier2Router.rc
index e299ec97c24..2d5801f077c 100644
--- a/cpp/src/Glacier2/Glacier2Router.rc
+++ b/cpp/src/Glacier2/Glacier2Router.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Glacier2 Router\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "glacier2router\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "glacier2router.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc
index 8bbcad44052..3d7ba3eacc8 100644
--- a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Glacier2CryptPermissionsVerifier C++ Plug-in\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Glacier2Lib/Glacier2.rc b/cpp/src/Glacier2Lib/Glacier2.rc
index bbbc580825c..b382e90dd67 100644
--- a/cpp/src/Glacier2Lib/Glacier2.rc
+++ b/cpp/src/Glacier2Lib/Glacier2.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Glacier2 C++ Client Library\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Ice/Ice.rc b/cpp/src/Ice/Ice.rc
index bbbd822a1f1..f8577c30208 100644
--- a/cpp/src/Ice/Ice.rc
+++ b/cpp/src/Ice/Ice.rc
@@ -2,8 +2,8 @@
 #include "EventLoggerMsg.rc"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -24,12 +24,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Ice C++ Core Library\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBox.rc b/cpp/src/IceBox/IceBox.rc
index 11a7097a184..394ba232d4d 100644
--- a/cpp/src/IceBox/IceBox.rc
+++ b/cpp/src/IceBox/IceBox.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceBox C++ Library\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBoxAdmin.rc b/cpp/src/IceBox/IceBoxAdmin.rc
index c7dbe72ee13..3bf1d1ddf6b 100644
--- a/cpp/src/IceBox/IceBoxAdmin.rc
+++ b/cpp/src/IceBox/IceBoxAdmin.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceBox Admin\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "iceboxadmin\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "iceboxadmin.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBoxExe.rc b/cpp/src/IceBox/IceBoxExe.rc
index e252ff49023..50a02cf3821 100644
--- a/cpp/src/IceBox/IceBoxExe.rc
+++ b/cpp/src/IceBox/IceBoxExe.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceBox C++ Server\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceDiscovery/IceDiscovery.rc b/cpp/src/IceDiscovery/IceDiscovery.rc
index 47326d80b2c..6c549e2dbad 100755
--- a/cpp/src/IceDiscovery/IceDiscovery.rc
+++ b/cpp/src/IceDiscovery/IceDiscovery.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceDiscovery C++ Plug-in\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridAdmin.rc b/cpp/src/IceGrid/IceGridAdmin.rc
index 9876d9124ff..62048527836 100644
--- a/cpp/src/IceGrid/IceGridAdmin.rc
+++ b/cpp/src/IceGrid/IceGridAdmin.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid Admin\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "icegridadmin\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icegridadmin.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridDB.rc b/cpp/src/IceGrid/IceGridDB.rc
index 499bed1fb7a..151020205e0 100644
--- a/cpp/src/IceGrid/IceGridDB.rc
+++ b/cpp/src/IceGrid/IceGridDB.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGridDB\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "icegriddb\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icegriddb.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridNode.rc b/cpp/src/IceGrid/IceGridNode.rc
index 663a59a7331..beaff14b0e3 100644
--- a/cpp/src/IceGrid/IceGridNode.rc
+++ b/cpp/src/IceGrid/IceGridNode.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid Node\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "icegridnode\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icegridnode.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridRegistry.rc b/cpp/src/IceGrid/IceGridRegistry.rc
index 67031ebddb2..9b54aad6791 100644
--- a/cpp/src/IceGrid/IceGridRegistry.rc
+++ b/cpp/src/IceGrid/IceGridRegistry.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid Registry\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "icegridregistry\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icegridregistry.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGridLib/IceGrid.rc b/cpp/src/IceGridLib/IceGrid.rc
index f6be3ff9139..65728ae1fb6 100644
--- a/cpp/src/IceGridLib/IceGrid.rc
+++ b/cpp/src/IceGridLib/IceGrid.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid C++ Client Library\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc b/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc
index 757ae84be78..a6268af65ad 100755
--- a/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc
+++ b/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceLocatorDiscovery C++ Plug-in\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Calc.rc b/cpp/src/IcePatch2/IcePatch2Calc.rc
index 9cb67dc9fde..43b3b6c7367 100644
--- a/cpp/src/IcePatch2/IcePatch2Calc.rc
+++ b/cpp/src/IcePatch2/IcePatch2Calc.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IcePatch2 Calc\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "icepatch2calc\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icepatch2calc.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Client.rc b/cpp/src/IcePatch2/IcePatch2Client.rc
index fcf9ca02c9c..915b27b449b 100644
--- a/cpp/src/IcePatch2/IcePatch2Client.rc
+++ b/cpp/src/IcePatch2/IcePatch2Client.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IcePatch2 Client\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "icepatch2client\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icepatch2client.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Server.rc b/cpp/src/IcePatch2/IcePatch2Server.rc
index 662dbce1656..3ea2d1898c1 100644
--- a/cpp/src/IcePatch2/IcePatch2Server.rc
+++ b/cpp/src/IcePatch2/IcePatch2Server.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IcePatch2 Server\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "icepatch2server\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icepatch2server.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2Lib/IcePatch2.rc b/cpp/src/IcePatch2Lib/IcePatch2.rc
index 89398fe503d..4e4bc0b69d1 100644
--- a/cpp/src/IcePatch2Lib/IcePatch2.rc
+++ b/cpp/src/IcePatch2Lib/IcePatch2.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IcePatch2 Client Library\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceSSL/IceSSL.rc b/cpp/src/IceSSL/IceSSL.rc
index 5e91bedd9f2..887344f64c2 100644
--- a/cpp/src/IceSSL/IceSSL.rc
+++ b/cpp/src/IceSSL/IceSSL.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceSSL C++ Plug-in\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormAdmin.rc b/cpp/src/IceStorm/IceStormAdmin.rc
index c66fbf5ac57..7614ab71078 100644
--- a/cpp/src/IceStorm/IceStormAdmin.rc
+++ b/cpp/src/IceStorm/IceStormAdmin.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm Admin\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "icestormadmin\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icestormadmin.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormDB.rc b/cpp/src/IceStorm/IceStormDB.rc
index b9fbd0b228e..7c5d32fbcfd 100644
--- a/cpp/src/IceStorm/IceStormDB.rc
+++ b/cpp/src/IceStorm/IceStormDB.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStormDB\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "icestormdb\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icestormdb.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormMigrate.rc b/cpp/src/IceStorm/IceStormMigrate.rc
index abe3c68f499..29c235d5bbf 100644
--- a/cpp/src/IceStorm/IceStormMigrate.rc
+++ b/cpp/src/IceStorm/IceStormMigrate.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Migration Utility for IceStorm Database\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "icestormmigrate\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icestormmigrate.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormService.rc b/cpp/src/IceStorm/IceStormService.rc
index 1fa6fa16f84..a415a7657bb 100644
--- a/cpp/src/IceStorm/IceStormService.rc
+++ b/cpp/src/IceStorm/IceStormService.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm C++ Service for IceBox\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStormLib/IceStorm.rc b/cpp/src/IceStormLib/IceStorm.rc
index 23b2093410c..9405ecb0ca9 100644
--- a/cpp/src/IceStormLib/IceStorm.rc
+++ b/cpp/src/IceStormLib/IceStorm.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm C++ Client Library\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceUtil/IceUtil.rc b/cpp/src/IceUtil/IceUtil.rc
index 3810f0aa3ea..d9dc5f2bb40 100644
--- a/cpp/src/IceUtil/IceUtil.rc
+++ b/cpp/src/IceUtil/IceUtil.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Ice C++ Utility Library\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceXML/IceXML.rc b/cpp/src/IceXML/IceXML.rc
index e99c5efafeb..644c1df9e73 100644
--- a/cpp/src/IceXML/IceXML.rc
+++ b/cpp/src/IceXML/IceXML.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceXML C++ Library\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Slice/Slice.rc b/cpp/src/Slice/Slice.rc
index fdf1ed46132..c89c5b383ca 100644
--- a/cpp/src/Slice/Slice.rc
+++ b/cpp/src/Slice/Slice.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice C++ Library\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/iceserviceinstall/IceServiceInstall.rc b/cpp/src/iceserviceinstall/IceServiceInstall.rc
index eabea615a3b..d31407c2274 100644
--- a/cpp/src/iceserviceinstall/IceServiceInstall.rc
+++ b/cpp/src/iceserviceinstall/IceServiceInstall.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Install Ice Services as Windows Services\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "iceserviceinstall\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "iceserviceinstall.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2confluence/Slice2Confluence.rc b/cpp/src/slice2confluence/Slice2Confluence.rc
index d111abf9674..1b4dfed0ab8 100644
--- a/cpp/src/slice2confluence/Slice2Confluence.rc
+++ b/cpp/src/slice2confluence/Slice2Confluence.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice to Confluence Markup Translator\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "slice2confluence\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "slice2confluence.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2cpp/Slice2Cpp.rc b/cpp/src/slice2cpp/Slice2Cpp.rc
index 7cbc107d57e..f7c47855132 100644
--- a/cpp/src/slice2cpp/Slice2Cpp.rc
+++ b/cpp/src/slice2cpp/Slice2Cpp.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice to C++ Translator\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "slice2cpp\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "slice2cpp.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2cs/Slice2Cs.rc b/cpp/src/slice2cs/Slice2Cs.rc
index 4b935adc752..174785ed336 100644
--- a/cpp/src/slice2cs/Slice2Cs.rc
+++ b/cpp/src/slice2cs/Slice2Cs.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice to C# Translator\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "slice2cs\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "slice2cs.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2freeze/Slice2Freeze.rc b/cpp/src/slice2freeze/Slice2Freeze.rc
index 0c894708bb1..d90e354140f 100644
--- a/cpp/src/slice2freeze/Slice2Freeze.rc
+++ b/cpp/src/slice2freeze/Slice2Freeze.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice to Freeze for C++ Translator\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "slice2freeze\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "slice2freeze.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2freezej/Slice2FreezeJ.rc b/cpp/src/slice2freezej/Slice2FreezeJ.rc
index bf4ebd81097..8140ddb772b 100644
--- a/cpp/src/slice2freezej/Slice2FreezeJ.rc
+++ b/cpp/src/slice2freezej/Slice2FreezeJ.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice to Freeze for Java Translator\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "slice2freezej\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "slice2freezej.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2html/Slice2Html.rc b/cpp/src/slice2html/Slice2Html.rc
index ced3bb32952..2e833c2e8ab 100644
--- a/cpp/src/slice2html/Slice2Html.rc
+++ b/cpp/src/slice2html/Slice2Html.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice to HTML Translator\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "slice2html\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "slice2html.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2java/Slice2Java.rc b/cpp/src/slice2java/Slice2Java.rc
index ac1a8cde05f..6b1d0209dac 100644
--- a/cpp/src/slice2java/Slice2Java.rc
+++ b/cpp/src/slice2java/Slice2Java.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice to Java Translator\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "slice2java\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "slice2java.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2js/Slice2Js.rc b/cpp/src/slice2js/Slice2Js.rc
index 855d1667576..dc1c9b05377 100644
--- a/cpp/src/slice2js/Slice2Js.rc
+++ b/cpp/src/slice2js/Slice2Js.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice to JavaScript Translator\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "slice2js\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "slice2js.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2php/Slice2PHP.rc b/cpp/src/slice2php/Slice2PHP.rc
index 9c4f8362217..bcbe9d3048e 100644
--- a/cpp/src/slice2php/Slice2PHP.rc
+++ b/cpp/src/slice2php/Slice2PHP.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice to PHP Translator\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "slice2php\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "slice2php.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2py/Slice2Py.rc b/cpp/src/slice2py/Slice2Py.rc
index e6cc7f9f4b9..8be8601392a 100644
--- a/cpp/src/slice2py/Slice2Py.rc
+++ b/cpp/src/slice2py/Slice2Py.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To Python Translator\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", "slice2py\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2016 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2py.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX
index 8e81ec2aeb3..0c3927d1414 100644
--- a/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX
+++ b/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX
@@ -1,6 +1,6 @@
-  0 IceUtil::Exception::Exception(char const*, int) in libIceUtil.3.6.2.dylib
-  1 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.6.2.dylib
-  2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.6.2.dylib
+  0 IceUtil::Exception::Exception(char const*, int) in libIceUtil.3.6.3.dylib
+  1 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.6.3.dylib
+  2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.6.3.dylib
   3 (anonymous namespace)::Thrower::fifth() in client
   4 (anonymous namespace)::Thrower::forth() in client
   5 (anonymous namespace)::Thrower::third() in client
diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX
index a3c867c8e26..2471e7cae65 100644
--- a/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX
+++ b/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX
@@ -1,3 +1,3 @@
-  0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.6.2.dylib
+  0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.6.3.dylib
   1 main() in client
   2 start() in libdyld.dylib
\ No newline at end of file
diff --git a/csharp/BuildInstructions.md b/csharp/BuildInstructions.md
index ea016942c82..d6589bfcc01 100644
--- a/csharp/BuildInstructions.md
+++ b/csharp/BuildInstructions.md
@@ -25,7 +25,7 @@ The build system requires the Slice translator from Ice for C++. If you have not
 built Ice for C++ in this source distribution, you must set the `ICE_HOME`
 environment variable with the path name of your Ice installation:
 
-    > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.6.2
+    > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.6.3
 
 ### Building Ice for .NET
 
@@ -49,7 +49,7 @@ C++ distribution. If you have not built Ice for C++ in this source distribution
 then you must set the `ICE_HOME` environment variable with the path name of your
 Ice installation:
 
-    > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.6.2
+    > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.6.3
 
 Python is required to run the test suite. Additionally, the Glacier2 tests
 require the Python module `passlib`, which you can install with the command:
diff --git a/csharp/lib/pkgconfig/Glacier2.pc b/csharp/lib/pkgconfig/Glacier2.pc
index 2a0ce2a70cc..893f550a02f 100644
--- a/csharp/lib/pkgconfig/Glacier2.pc
+++ b/csharp/lib/pkgconfig/Glacier2.pc
@@ -1,4 +1,4 @@
-version = 3.6.2
+version = 3.6.3
 mono_root = /usr
 
 name = Glacier2
diff --git a/csharp/lib/pkgconfig/Ice.pc b/csharp/lib/pkgconfig/Ice.pc
index 1eae5cc089c..02f05125db0 100644
--- a/csharp/lib/pkgconfig/Ice.pc
+++ b/csharp/lib/pkgconfig/Ice.pc
@@ -1,4 +1,4 @@
-version = 3.6.2
+version = 3.6.3
 mono_root = /usr
 
 name = Ice
diff --git a/csharp/lib/pkgconfig/IceBox.pc b/csharp/lib/pkgconfig/IceBox.pc
index 37da7ca719b..f36f3fed414 100644
--- a/csharp/lib/pkgconfig/IceBox.pc
+++ b/csharp/lib/pkgconfig/IceBox.pc
@@ -1,4 +1,4 @@
-version = 3.6.2
+version = 3.6.3
 mono_root = /usr
 
 name = IceBox
diff --git a/csharp/lib/pkgconfig/IceGrid.pc b/csharp/lib/pkgconfig/IceGrid.pc
index 7a7abefa04e..38a7e5c01b3 100644
--- a/csharp/lib/pkgconfig/IceGrid.pc
+++ b/csharp/lib/pkgconfig/IceGrid.pc
@@ -1,4 +1,4 @@
-version = 3.6.2
+version = 3.6.3
 mono_root = /usr
 
 name = IceGrid
diff --git a/csharp/lib/pkgconfig/IcePatch2.pc b/csharp/lib/pkgconfig/IcePatch2.pc
index d386356cb14..9277935efe3 100644
--- a/csharp/lib/pkgconfig/IcePatch2.pc
+++ b/csharp/lib/pkgconfig/IcePatch2.pc
@@ -1,4 +1,4 @@
-version = 3.6.2
+version = 3.6.3
 mono_root = /usr
 
 name = IcePatch2
diff --git a/csharp/lib/pkgconfig/IceStorm.pc b/csharp/lib/pkgconfig/IceStorm.pc
index 9fad9bf6800..01b8fe987bf 100644
--- a/csharp/lib/pkgconfig/IceStorm.pc
+++ b/csharp/lib/pkgconfig/IceStorm.pc
@@ -1,4 +1,4 @@
-version = 3.6.2
+version = 3.6.3
 mono_root = /usr
 
 name = IceStorm
diff --git a/csharp/src/Glacier2/AssemblyInfo.cs b/csharp/src/Glacier2/AssemblyInfo.cs
index 4efee6e48af..0d11aca267a 100644
--- a/csharp/src/Glacier2/AssemblyInfo.cs
+++ b/csharp/src/Glacier2/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyProduct("Ice")]
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
-[assembly: AssemblyVersion("3.6.2")]
+[assembly: AssemblyVersion("3.6.3")]
 [assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/Ice/AssemblyInfo.cs b/csharp/src/Ice/AssemblyInfo.cs
index afe1d8ca2fd..55a800216ea 100644
--- a/csharp/src/Ice/AssemblyInfo.cs
+++ b/csharp/src/Ice/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyProduct("Ice")]
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
-[assembly: AssemblyVersion("3.6.2")]
+[assembly: AssemblyVersion("3.6.3")]
 [assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/Ice/Util.cs b/csharp/src/Ice/Util.cs
index b5ba9879420..429e9358634 100644
--- a/csharp/src/Ice/Util.cs
+++ b/csharp/src/Ice/Util.cs
@@ -555,7 +555,7 @@ namespace Ice
         /// <returns>The Ice version.</returns>
         public static string stringVersion()
         {
-            return "3.6.2"; // "A.B.C", with A=major, B=minor, C=patch
+            return "3.6.3"; // "A.B.C", with A=major, B=minor, C=patch
         }
 
         /// <summary>
@@ -566,7 +566,7 @@ namespace Ice
         /// <returns>The Ice version.</returns>
         public static int intVersion()
         {
-            return 30602; // AABBCC, with AA=major, BB=minor, CC=patch
+            return 30603; // AABBCC, with AA=major, BB=minor, CC=patch
         }
 
         /// <summary>
diff --git a/csharp/src/IceBox/AssemblyInfo.cs b/csharp/src/IceBox/AssemblyInfo.cs
index 5663af338f4..d508a945d2b 100644
--- a/csharp/src/IceBox/AssemblyInfo.cs
+++ b/csharp/src/IceBox/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyProduct("Ice")]
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
-[assembly: AssemblyVersion("3.6.2")]
+[assembly: AssemblyVersion("3.6.3")]
 [assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/IceBox/AssemblyInfoExe.cs b/csharp/src/IceBox/AssemblyInfoExe.cs
index 06d217d9389..364ac72adb3 100644
--- a/csharp/src/IceBox/AssemblyInfoExe.cs
+++ b/csharp/src/IceBox/AssemblyInfoExe.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyProduct("Ice")]
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
-[assembly: AssemblyVersion("3.6.2")]
+[assembly: AssemblyVersion("3.6.3")]
 [assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/IceBox/Makefile.mak b/csharp/src/IceBox/Makefile.mak
index acefe63a2d5..90e7fd24f87 100644
--- a/csharp/src/IceBox/Makefile.mak
+++ b/csharp/src/IceBox/Makefile.mak
@@ -74,11 +74,11 @@ iceboxnetconfig:
       <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
          <dependentAssembly>
             <assemblyIdentity name="Ice"  culture="neutral" publicKeyToken="$(publicKeyToken)"/>
-            <codeBase version="3.6.2.0" href="..\Assemblies\Ice.dll"/>
+            <codeBase version="3.6.3.0" href="..\Assemblies\Ice.dll"/>
          </dependentAssembly>
          <dependentAssembly>
             <assemblyIdentity name="IceBox"  culture="neutral" publicKeyToken="$(publicKeyToken)"/>
-            <codeBase version="3.6.2.0" href="..\Assemblies\IceBox.dll"/>
+            <codeBase version="3.6.3.0" href="..\Assemblies\IceBox.dll"/>
          </dependentAssembly>
          <!-- 
            This allows iceboxnet to load the IceSSL plug-in using a strong name. We omit the
@@ -87,7 +87,7 @@ iceboxnetconfig:
 	 -->
          <dependentAssembly>
             <assemblyIdentity name="IceSSL"/>
-            <codeBase version="3.6.2.0" href="..\Assemblies\IceSSL.dll"/>
+            <codeBase version="3.6.3.0" href="..\Assemblies\IceSSL.dll"/>
          </dependentAssembly>
       </assemblyBinding>
    </runtime>
diff --git a/csharp/src/IceDiscovery/AssemblyInfo.cs b/csharp/src/IceDiscovery/AssemblyInfo.cs
index 8335539b4cc..0a83569de64 100644
--- a/csharp/src/IceDiscovery/AssemblyInfo.cs
+++ b/csharp/src/IceDiscovery/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyProduct("Ice")]
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
-[assembly: AssemblyVersion("3.6.2")]
+[assembly: AssemblyVersion("3.6.3")]
 [assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/IceGrid/AssemblyInfo.cs b/csharp/src/IceGrid/AssemblyInfo.cs
index 8374dcba033..36f475928df 100644
--- a/csharp/src/IceGrid/AssemblyInfo.cs
+++ b/csharp/src/IceGrid/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyProduct("Ice")]
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
-[assembly: AssemblyVersion("3.6.2")]
+[assembly: AssemblyVersion("3.6.3")]
 [assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
index 5850f929d22..ab3a117745a 100644
--- a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
+++ b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyProduct("Ice")]
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
-[assembly: AssemblyVersion("3.6.2")]
+[assembly: AssemblyVersion("3.6.3")]
 [assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/IcePatch2/AssemblyInfo.cs b/csharp/src/IcePatch2/AssemblyInfo.cs
index bf9e76dac3a..d48ee9aa0da 100644
--- a/csharp/src/IcePatch2/AssemblyInfo.cs
+++ b/csharp/src/IcePatch2/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyProduct("Ice")]
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
-[assembly: AssemblyVersion("3.6.2")]
+[assembly: AssemblyVersion("3.6.3")]
 [assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/IceSSL/AssemblyInfo.cs b/csharp/src/IceSSL/AssemblyInfo.cs
index 589ec21f02e..d97caee42ac 100644
--- a/csharp/src/IceSSL/AssemblyInfo.cs
+++ b/csharp/src/IceSSL/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyProduct("Ice")]
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
-[assembly: AssemblyVersion("3.6.2")]
+[assembly: AssemblyVersion("3.6.3")]
 [assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/IceStorm/AssemblyInfo.cs b/csharp/src/IceStorm/AssemblyInfo.cs
index 5de3716f215..bebfee0ae48 100644
--- a/csharp/src/IceStorm/AssemblyInfo.cs
+++ b/csharp/src/IceStorm/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyProduct("Ice")]
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
-[assembly: AssemblyVersion("3.6.2")]
+[assembly: AssemblyVersion("3.6.3")]
 [assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/test/TestCommon/Properties/AssemblyInfo.cs b/csharp/test/TestCommon/Properties/AssemblyInfo.cs
index 2ffa982f400..dd592245bcb 100644
--- a/csharp/test/TestCommon/Properties/AssemblyInfo.cs
+++ b/csharp/test/TestCommon/Properties/AssemblyInfo.cs
@@ -39,7 +39,7 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.6.2")]
-[assembly: AssemblyFileVersion("3.6.2")]
+[assembly: AssemblyVersion("3.6.3")]
+[assembly: AssemblyFileVersion("3.6.3")]
 
 [assembly: System.CLSCompliant(true)]
diff --git a/java/BuildInstructions.md b/java/BuildInstructions.md
index e5e3e16079d..3fc75b0a4a6 100644
--- a/java/BuildInstructions.md
+++ b/java/BuildInstructions.md
@@ -141,12 +141,12 @@ have not built Ice for C++ in this source distribution, you must set the
 `ICE_HOME` environment variable with the path name of your Ice installation.
 For example, on Unix:
 
-    $ export ICE_HOME=/opt/Ice-3.6.2 (For local build)
+    $ export ICE_HOME=/opt/Ice-3.6.3 (For local build)
     $ export ICE_HOME=/usr (For RPM installation)
 
 On Windows:
 
-    > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.6.2
+    > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.6.3
 
 Before building Ice for Java, review the settings in the file
 `gradle.properties` and edit as necessary.
@@ -176,7 +176,7 @@ The installation installs the following JAR files to `<prefix>/lib`.
 
     freeze-3.6.2.jar
     glacier2-3.6.2.jar
-    ice-3.6.2.jar
+    ice-3.6.3.jar
     icebox-3.6.2.jar
     icediscovery-3.6.2.jar
     icegrid-3.6.2.jar
@@ -195,12 +195,12 @@ C++ distribution. If you have not built Ice for C++ in this source distribution
 then you must set the `ICE_HOME` environment variable with the path name of your
 Ice installation. On Unix:
 
-    $ export ICE_HOME=/opt/Ice-3.6.2 (For local build)
+    $ export ICE_HOME=/opt/Ice-3.6.3 (For local build)
     $ export ICE_HOME=/usr (For RPM installation)
 
 On Windows:
 
-    > set ICE_HOME=c:\Program Files (x86)\ZeroC\Ice-3.6.2
+    > set ICE_HOME=c:\Program Files (x86)\ZeroC\Ice-3.6.3
 
 Python is required to run the test suite. To run the tests, open a command
 window and change to the top-level directory. At the command prompt, execute:
diff --git a/java/gradle.properties b/java/gradle.properties
index 49737925e6b..36ee033c4dd 100644
--- a/java/gradle.properties
+++ b/java/gradle.properties
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-iceVersion = 3.6.2
+iceVersion = 3.6.3
 
 //
 // The directory that contains Oracle Berkeley DB's db.jar file. When not
diff --git a/java/src/Ice/src/main/java/Ice/Util.java b/java/src/Ice/src/main/java/Ice/Util.java
index b2cc28106a3..bd2db69babb 100644
--- a/java/src/Ice/src/main/java/Ice/Util.java
+++ b/java/src/Ice/src/main/java/Ice/Util.java
@@ -571,7 +571,7 @@ public final class Util
     public static String
     stringVersion()
     {
-        return "3.6.2"; // "A.B.C", with A=major, B=minor, C=patch
+        return "3.6.3"; // "A.B.C", with A=major, B=minor, C=patch
     }
 
     /**
@@ -584,7 +584,7 @@ public final class Util
     public static int
     intVersion()
     {
-        return 30602; // AABBCC, with AA=major, BB=minor, CC=patch
+        return 30603; // AABBCC, with AA=major, BB=minor, CC=patch
     }
 
     /**
diff --git a/js/BuildInstructions.md b/js/BuildInstructions.md
index 110605bbec3..7dfddc8f17a 100644
--- a/js/BuildInstructions.md
+++ b/js/BuildInstructions.md
@@ -136,9 +136,9 @@ following command:
 
     > npm pack
 
-This will generate the file `ice-3.6.2.tgz`, which can be installed by running:
+This will generate the file `ice-3.6.3.tgz`, which can be installed by running:
 
-    > npm install <path_to_file>/ice-3.6.2.tgz
+    > npm install <path_to_file>/ice-3.6.3.tgz
 
 To use Ice for JavaScript with a browser, copy the appropriate JavaScript
 library files located in the `lib` directory to your web server.
diff --git a/js/package.json b/js/package.json
index ead94b0c952..7b5e3130ad2 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ice",
-  "version": "3.6.2",
+  "version": "3.6.3",
   "description": "Ice for JavaScript runtime",
   "author": "Zeroc, Inc.",
   "homepage": "https://zeroc.com",
diff --git a/php/src/IcePHP/IcePHP.rc b/php/src/IcePHP/IcePHP.rc
index ee77391769a..de4c575714f 100644
--- a/php/src/IcePHP/IcePHP.rc
+++ b/php/src/IcePHP/IcePHP.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Ice for PHP Extension\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2016 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/python/modules/IcePy/IcePy.rc b/python/modules/IcePy/IcePy.rc
index 0dc5be2b271..d3cbcdc30be 100644
--- a/python/modules/IcePy/IcePy.rc
+++ b/python/modules/IcePy/IcePy.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,2,0
- PRODUCTVERSION 3,6,2,0
+ FILEVERSION 3,6,3,0
+ PRODUCTVERSION 3,6,3,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Ice for Python Extension\0"
-            VALUE "FileVersion", "3.6.2\0"
+            VALUE "FileVersion", "3.6.3\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2016 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.2\0"
+            VALUE "ProductVersion", "3.6.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/ruby/BuildInstructionsWindows.md b/ruby/BuildInstructionsWindows.md
index 0c12d36f7ab..0a945219b9f 100644
--- a/ruby/BuildInstructionsWindows.md
+++ b/ruby/BuildInstructionsWindows.md
@@ -28,7 +28,7 @@ The instructions in this file make the following assumptions about your build
 environment:
 
 1. You have installed the Ice 3.6.2 distribution using the ZeroC installer. The
-default installation directory is `C:\Program Files (x86)\ZeroC\Ice-3.6.2`.
+default installation directory is `C:\Program Files (x86)\ZeroC\Ice-3.6.3`.
 2. You have installed Ruby 2.2.4 using the Windows installer. The default
 installation directory is `C:\Ruby224`.
 3. You have installed the Ruby Development Kit 4.7.2 in `C:\RubyDevKit-4.7.2`.
@@ -70,7 +70,7 @@ forward slashes (/) as directory separators, and cannot contain any space.
 If your Ice installation's path contains any space, use the DOS 8-character
 name as a work-around, for example:
 
-    > set ICE_HOME=C:/PROGRA~2/Ice-3.6.2
+    > set ICE_HOME=C:/PROGRA~2/Ice-3.6.3
 
 You can use `dir /x` to get this DOS name, for example:
 
@@ -105,20 +105,20 @@ The Ruby interpreter must be able to locate the Ice extension. One way to
 configure the interpreter is to define the `RUBYLIB` environment variable as
 follows:
 
-    > set RUBYLIB=C:\Ice-3.6.2\ruby
+    > set RUBYLIB=C:\Ice-3.6.3\ruby
 
-This example assumes your Ice for Ruby installation is located in the `C:\Ice-3.6.2`
+This example assumes your Ice for Ruby installation is located in the `C:\Ice-3.6.3`
 directory.
 
 In addition, you must modify your PATH environment variable to include the
 following directories:
 
-    C:\Program Files (x86)\ZeroC\Ice-3.6.2\bin
-    C:\Ice-3.6.2\bin
+    C:\Program Files (x86)\ZeroC\Ice-3.6.3\bin
+    C:\Ice-3.6.3\bin
 
 At a command prompt, you can set your PATH as shown below:
 
-    > set PATH=C:\Program Files (x86)\ZeroC\Ice-3.6.2\bin;C:\Ice-3.6.2\bin;%PATH%
+    > set PATH=C:\Program Files (x86)\ZeroC\Ice-3.6.3\bin;C:\Ice-3.6.3\bin;%PATH%
 
 ## Running the Ruby Tests