61 files changed, 826 insertions, 66 deletions
diff --git a/ACE/ChangeLogs/ACE-6_4_1 b/ACE/ChangeLogs/ACE-6_4_1
new file mode 100644
index 00000000000..4291f232c1d
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_4_1
@@ -0,0 +1,509 @@
+commit 83db1ec85068af6520fbe44d324d9df34218b302
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Oct 6 12:41:00 2016 +0200
+
+    Zapped some empty lines
+        * ACE/apps/gperf/tests/test.cpp:
+
+commit a796d2a58d1fe560af15661f4d640d9eaae20c85
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Oct 6 09:43:53 2016 +0200
+
+    Removed the bug fix only release concept, all micro releases the last years have been stable and there is no need anymore to have a special BFO release anymore
+        * ACE/bin/make_release.py:
+        * ACE/docs/ACE-development-process.html:
+        * ACE/docs/Download.html:
+
+commit 8829191dda28a35e81d9fbe6b7c29abc9bb16524
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Oct 5 19:40:35 2016 +0200
+
+    Remove ACE_STATIC_CONSTANT because there is no compiler anymore that lacks the support for static constants
+        * ACE/ace/Global_Macros.h:
+        * ACE/ace/Truncate.h:
+
+commit 999c2d14947c0e6f67061972cc8971789c5acbb4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Oct 4 12:07:48 2016 +0200
+
+    Extended list of user visible changes
+        * ACE/NEWS:
+        * TAO/NEWS:
+
+commit 40cb5c604df5682bef240be456b52e135615770d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Oct 4 10:56:18 2016 +0200
+
+    Make this script work again with newer perl versions
+        * ACE/bin/diff-builds.pl:
+
+commit 4e484bfb6c0ee71bde2313e333368a6b43fe937d
+Merge: 1dacd12 4b67e5a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Oct 3 20:13:57 2016 +0200
+
+    gerge branch 'master' of git://github.com/DOCGroup/ATCD
+
+commit 1dacd1257ed117a8c04f283e3a662cda9bda539f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Oct 3 20:13:50 2016 +0200
+
+    Added cast to silence win32 warnings
+        * ACE/ace/Time_Value.cpp:
+
+commit 4b67e5a178658c04d86232b1bd649ecd3caf66b4
+Merge: b1d7ab6 1c7fca0
+Author: Johnny Willemsen <jwillemsen@users.noreply.github.com>
+Date:   Mon Oct 3 14:16:35 2016 +0200
+
+    Merge pull request #306 from jwillemsen/master
+    
+    Cleanup travis-ci support, some experiments for OSX but not completed
+
+commit bd14f06fed22d7c77e0c54bddcd191a883cf72ad
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Oct 2 20:53:26 2016 +0200
+
+    Fixed typo
+
+commit 0c03edc0a82959b51724d49e9ec2676609d5de9a
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Sep 30 14:55:21 2016 -0500
+
+    NEWS updates
+
+commit fd0d79f44b951665480b34449d969fa20cdf43ac
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 27 08:24:59 2016 +0200
+
+    Set ACE_PLATFORM_CONFIG to config-android.h
+        * ACE/include/makeinclude/platform_android.GNU:
+
+commit 65a6d0bb86e9df6fd323f646a512b9527ec73cb4
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Mon Sep 26 14:03:12 2016 -0500
+
+    Support for Android NDK r12b (Platform API 24)
+
+commit ff14fd0b2562642866130b3e1b6ccbbd318365f0
+Merge: ad376e1 41f7f57
+Author: Johnny Willemsen <jwillemsen@users.noreply.github.com>
+Date:   Sat Sep 24 09:18:25 2016 +0200
+
+    Merge pull request #301 from DOCGroup/revert-300-master
+    
+    Revert "ACE Core Typo Bug"
+
+commit 7f4cb857d93eaef328201ff95560f48eaa155c60
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Sep 24 09:03:56 2016 +0200
+
+    Disable newer features because they lead to runtime problems on Android
+        * ACE/ace/config-android.h:
+
+commit 41f7f5747390ecc906b9677670321c37fd0879c1
+Author: Johnny Willemsen <jwillemsen@users.noreply.github.com>
+Date:   Sat Sep 24 08:14:01 2016 +0200
+
+    Revert "ACE Core Typo Bug"
+
+commit ce6a48bf72de2c6f5aa2bfc099f1e87d4246b5dd
+Merge: d788b54 ddc8667
+Author: Johnny Willemsen <jwillemsen@users.noreply.github.com>
+Date:   Fri Sep 23 13:56:22 2016 +0200
+
+    Merge pull request #300 from GaryN4/master
+    
+    ACE Core Typo Bug
+
+commit 784a25d9950a1c5587a1ca51c41ca6f84b9e3e60
+Merge: 688a39c 9979d94
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Sep 22 16:10:14 2016 -0500
+
+    Merge pull request #298 from huangminghuang/macosx_elcapitan
+    
+    Better Mac OSX support
+
+commit 688a39c1edaa36714a33c088cb3d6b0273796534
+Merge: 92223ac e573d3d
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Sep 22 16:10:09 2016 -0500
+
+    Merge pull request #297 from mitza-oci/master
+    
+    Use env var ACE_DEBUG to set ACE::debug_ from the environment.
+
+commit 9979d94aaf9ced72f193f2197dd3fa2901958363
+Author: Huang-Ming Huang <huangh@ociweb.com>
+Date:   Wed Sep 21 15:08:19 2016 -0500
+
+    remove '-all' from the filenames of  config-macosx-all.h and platform_macosx_all.GNU and rename the original *macosx.(h,GNU) files with juguar suffix
+
+commit e573d3d883eb53b4713e467dc611127a28ac4112
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Wed Sep 21 14:28:10 2016 -0500
+
+    Fuzz script needs special comments for this case
+
+commit 1e2f6fc64b2cc8fdf6824545a77cb93a8e890c8f
+Author: Huang-Ming Huang <huangh@ociweb.com>
+Date:   Wed Sep 21 13:25:48 2016 -0500
+
+    Add ace/config-macosx-all.h and include/makeinclude/platform_macosx_all.GNU for auto-detecting macOS version
+
+commit e96e1a5f6dedc9931373e6619a6eddfd092cd144
+Author: Huang-Ming Huang <huangh@ociweb.com>
+Date:   Wed Sep 21 13:13:34 2016 -0500
+
+    Support MacOSX El Capitan without disabling the default System Integrity Protection mode.
+
+commit 5a15f3fc7dafee50bebd5436c2585021243b885e
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Wed Sep 21 12:31:02 2016 -0500
+
+    Use env var ACE_DEBUG to set ACE::debug_ from the environment.
+    
+    Looks like this was mistakenly updated to ACELIB_DEBUG when the logging statements were changed a few years ago.
+
+commit 7771149a115f4225b32990e97b5dc01766058ca4
+Author: Huang-Ming Huang <huangh@ociweb.com>
+Date:   Wed Sep 21 09:59:59 2016 -0500
+
+    Use explicit template class instantiation for ACE_*_SINGLETON_DECLARE with GCC 4 and above
+    
+    This prevents multiple definition of typeinfo symbols during linking,
+    only seen on arm-linux-gnueabihf-g++.
+
+commit 6cfd75bc1a5c717739f37a369ab82be4089c1a3d
+Author: GaryN4 <gary.nicholls@adaptivemobile.com>
+Date:   Thu Sep 15 15:43:46 2016 +0100
+
+    Update Time_Value.inl
+
+commit 7e30d370d0c7104b2ab0ea61c1ff93b9f15797a3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 14 15:25:13 2016 +0200
+
+    Fixed coverity error
+        * ACE/ace/Naming_Context.cpp:
+
+commit 037b0c63d3a2fb9eb6701122930583bba3ebd9c9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 14 15:17:54 2016 +0200
+
+    removed commented out code
+        * ACE/ACEXML/examples/SAXPrint/main.cpp:
+
+commit 06b6bea83df9722ada3a0972db825de7750eaf33
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 14 15:17:01 2016 +0200
+
+    Fixed coverity reported issues
+        * ACE/ACEXML/common/Mem_Map_Stream.cpp:
+        * ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp:
+        * ACE/ACEXML/examples/SAXPrint/Print_Handler.h:
+
+commit 4ebc48ab2088bb536b3810db372b830415bbe74c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 14 11:36:02 2016 +0200
+
+    Don't delete the member of the base in ACEXML_SAXNotSupportedException, the base class destructor already handles that
+        * ACE/ACEXML/common/SAXExceptions.cpp:
+
+commit 851196b5e70421cd62c16e47ccd3863591ffa8c7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 14 11:13:08 2016 +0200
+
+    Fixed reported memory leak by Coverity
+        * ACE/tests/Compiler_Features_21_Test.cpp:
+
+commit a49ca87a1393375a3c00363d94ec1ba0243ee8a1
+Merge: 37ce198 8e8a781
+Author: Johnny Willemsen <jwillemsen@users.noreply.github.com>
+Date:   Mon Sep 12 08:51:00 2016 +0200
+
+    Merge pull request #279 from dlifshitz-maca/BZ-4216_01
+    
+    BZ-4216 Android build fails when not cross-compiled on Linux
+
+commit 8e8a781442a5ae5e4938a469ac5e8df91f3707bd
+Author: David Lifshitz <dlifshitz@macadamian.com>
+Date:   Tue Aug 2 16:30:12 2016 -0400
+
+    BZ-4216 Android build fails when not cross-compiled on Linux
+    
+    [Changed]
+    platform_android.GNU
+    - removed extra comment and include
+
+commit 37ce198752139f0886592ff78879d0051736bb9a
+Merge: 4b78b50 e240612
+Author: Johnny Willemsen <jwillemsen@users.noreply.github.com>
+Date:   Sun Sep 11 12:45:10 2016 +0200
+
+    Merge pull request #292 from jwillemsen/master
+    
+    Use std::abs instead of abs
+
+commit 4b78b50b8a0ebeb75a285d0f5c7240bb6bad7ca6
+Merge: 5a33d55 f4bfd1c
+Author: Johnny Willemsen <jwillemsen@users.noreply.github.com>
+Date:   Sun Sep 11 11:18:32 2016 +0200
+
+    Merge pull request #291 from ops/master
+    
+    Take 2: Handle system functions that may be defined as macros on some…
+
+commit e24061216228b5ead1ea90e3e9d0d4df8df8b8f4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Sep 11 11:02:43 2016 +0200
+
+    Use std::abs instead of abs
+        * ACE/ace/Time_Value.cpp:
+
+commit f4bfd1ca023c8ea58aa3ca4147ff883b12ecde37
+Author: Olli Savia <ops@iki.fi>
+Date:   Fri Sep 9 18:07:48 2016 +0300
+
+    Moved ACE_LACKS_xxxTIME_R defines to config-win32-msvc.h
+
+commit c982c07989a3286e0f91705f0583b1ffad2dcda0
+Author: Olli Savia <ops@iki.fi>
+Date:   Fri Sep 9 17:47:40 2016 +0300
+
+    Take 2: Handle system functions that may be defined as macros on some platforms
+
+commit 5a33d55ef56723226a3d4ac779ecd4fe96530c38
+Merge: d19738b 58100d3
+Author: Johnny Willemsen <jwillemsen@users.noreply.github.com>
+Date:   Fri Sep 9 09:03:12 2016 +0200
+
+    Merge pull request #200 from INMarkus/Bug#4084-Patch
+    
+    Fix for  Bug 4084 - ACE_Time_Value::set(double) hangs on large numbers
+
+commit bc841d6bb68196f65d0286bd118af7fe3b67efdc
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 8 12:13:24 2016 +0200
+
+    Use stati65 with MinGW
+        * ACE/ace/OS_NS_sys_stat.h:
+
+commit 03ef5706e8b3dcdd8de7636f39aaca7543b23283
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 2 20:53:02 2016 +0200
+
+    Revert "*_SINGLETON_DECLARE needs to appear in .cpp files, not .h."
+    
+    This reverts commit 411929ec7d2550f289eb1a2f045f2fc6651cb002.
+
+commit 411929ec7d2550f289eb1a2f045f2fc6651cb002
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Wed Aug 24 15:40:44 2016 -0500
+
+    *_SINGLETON_DECLARE needs to appear in .cpp files, not .h.
+    
+    This prevents multiple definition of typeinfo symbols during linking,
+    only seen on arm-linux-gnueabihf-g++ but the code is invalid C++ on
+    all platforms.
+
+commit c6a04b11d5e960451861a5d51d469dc48376a05f
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Wed Aug 24 15:39:55 2016 -0500
+
+    fixed makefile syntax error
+
+commit 72c5994d4fae5813925762afd1f1cc102ae88944
+Merge: b3b4e68 1b4dabc
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Wed Aug 10 10:27:05 2016 -0500
+
+    Merge pull request #282 from oschwaldp-oci/topic_footprint_fixes
+    
+    Footprint script fixes
+
+commit 33c4e1e642d55814fd7bcd044a6ac7871208dbc2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 13:52:48 2016 +0200
+
+    Layout change
+        * ACE/ace/POSIX_Proactor.cpp:
+
+commit 68e2cf228e4f053358361993c4dccfde507ab9f7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 13:52:41 2016 +0200
+
+    removed SGI from comment, not used anymore
+        * ACE/ace/OS_NS_sys_mman.inl:
+
+commit ca6d7f0a90498b003eaa541394c3cb4d54d0f148
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 13:49:57 2016 +0200
+
+    Removed old left over of SGI
+        * ACE/ace/POSIX_Proactor.cpp:
+
+commit 571605a737200863989ba3d438e15619da419b1d
+Merge: 18cb084 a87c34e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 13:47:53 2016 +0200
+
+    Merge branch 'master' of git://github.com/DOCGroup/ATCD
+
+commit ad958e7639275dc8626599ac0bfcc805a7e4ea76
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 13:28:52 2016 +0200
+
+    Fixed typos
+        * ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp:
+        * ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp:
+        * ACE/examples/QOS/Simple/QoS_Util.cpp:
+        * TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h:
+        * TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h:
+        * TAO/orbsvcs/tests/AVStreams/Pluggable/server.h:
+
+commit 1b4dabcbd23e2892df7766bb719a64e001bdd9a5
+Author: Peter Oschwald <oschwaldp@ociweb.com>
+Date:   Tue Aug 9 16:48:47 2016 -0500
+
+    Remove sed search and replace as it malfunctions with files or directories ending or beginning with a 0, which in some cases like tests, causes the output links to break in the created report pages.
+
+commit b17449e2d53c67fb7343e594d65dcbd915d1d0b0
+Author: Peter Oschwald <oschwaldp@ociweb.com>
+Date:   Tue Aug 9 11:41:05 2016 -0500
+
+    Fix use case for non-ACE/TAO/CIAO/DAnCE footprint calculations.  Need to actually populate an array to pass to sort_list.
+
+commit 72485ec324e2c11a24ec679e8269c38122e323fc
+Author: David Lifshitz <dlifshitz@macadamian.com>
+Date:   Tue Aug 2 16:36:20 2016 -0400
+
+    BZ-4217 Android 6 with 3rd party AIO not working
+    
+    [Changed]
+    POSIX_Proactor.cpp
+    - disable an OS bounds check for Android since it does not support AIO
+      and ACE_HAS_AIO_CALLS will only be defined if a 3rd party lib is used
+    
+    [Tests]
+    Test 1:
+    1) Compile ACE for Android using a 3rd party AIO lib
+    2) In the implementation of ACE_Service_Handler::open, try to read from
+       an ACE_Asynch_Read_Stream
+    3) Verify it returns >= 0 with no error
+
+commit a84855c64690c8048fe1a8513c0a8b54af345b4b
+Author: David Lifshitz <dlifshitz@macadamian.com>
+Date:   Tue Aug 2 16:30:12 2016 -0400
+
+    BZ-4216 Android build fails when not cross-compiled on Linux
+    
+    [Changed]
+    platform_android.GNU
+    - replace the platform_linux_common.GNU include with its contents
+      except the erroneous call to getconf
+    
+    [Tests]
+    Test 1:
+    1) Compile ACE for Android using OSX or Windows
+    2) Verify build is successful
+
+commit c752cc58a68f2f91da9550764a55b6dc7f91432c
+Author: Steve Huston <shuston@riverace.com>
+Date:   Thu Jul 7 20:15:29 2016 -0400
+
+    Case 2025, see notes
+    (cherry picked from commit ce6901f995267e3bc2cf5695c1bca42bd07b44b0)
+
+commit 7627b5e0073d58550491af5493237880f514b66a
+Author: Steve Huston <shuston@riverace.com>
+Date:   Thu Jul 14 15:13:27 2016 -0400
+
+    Revert "Case 2025, see notes"; should have made this a pull request.
+    
+    This reverts commit dcdedb05f23e55c2c9b718e666554ed6e75d99a5.
+
+commit dcdedb05f23e55c2c9b718e666554ed6e75d99a5
+Author: Steve Huston <shuston@riverace.com>
+Date:   Thu Jul 7 20:15:29 2016 -0400
+
+    Case 2025, see notes
+    (cherry picked from commit ce6901f995267e3bc2cf5695c1bca42bd07b44b0)
+
+commit 64e20f76a068d75086794de63f31388c249ccad7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 6 20:18:13 2016 +0200
+
+    Removed empty comment lines
+        * ACE/tests/Compiler_Features_20_DLL.cpp:
+        * ACE/tests/Compiler_Features_22_DLL.cpp:
+
+commit b1b43173cff6eb21a5f7e9ce8ab18f62b2304225
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 6 09:30:47 2016 +0200
+
+    Updated lin
+        * ACE/ace/config-macosx-sierra.h:
+
+commit 0f7b8dcc81a8c1d7ebd1fb70573f1657dbb8ee80
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 6 09:29:40 2016 +0200
+
+    Fixed some version numbers
+        * ACE/debian/debian.control:
+
+commit a2b3e76ab4407981816cfa903b9fc749b8c53886
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 6 09:29:31 2016 +0200
+
+    New files for MacOSX 10.12 (Sierra)
+        * ACE/ace/config-macosx-sierra.h:
+        * ACE/include/makeinclude/platform_macosx_sierra.GNU:
+          Added.
+
+commit 7c7157b6132b68a04f064a1bdb949b9f9acc7188
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 09:31:26 2016 +0200
+
+    No CIAO+DAnCE
+        * ACE/docs/Download.html:
+
+commit da68e30dd6e6939b6aade74c46e25ca8594d7182
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 08:58:23 2016 +0200
+
+    Prepare for next release
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
+
+commit 58100d3aeae33252ad12446f620382734e8f02d2
+Author: INMarkus <markus.hossner@innovative-navigation.de>
+Date:   Tue Feb 23 11:39:20 2016 +0100
+
+    Update Time_Value_Test.cpp
+    
+    Added tests for setting of double values and to check performance of normalize for large numbers.
+
+commit 5f2fcf252b7b9790a2cb27e57f9d90ae7ea32f9e
+Author: INMakrus <markus.hossner@innovative-navigation.de>
+Date:   Mon Feb 22 23:18:46 2016 +0100
+
+    Update Time_Value.cpp
+    
+    - Better performance by not using a loop for normalizing time values
+
+commit 53f4a8826c9002a81f8c37acee13778c3f6674d0
+Author: INMakrus <markus.hossner@innovative-navigation.de>
+Date:   Mon Feb 22 23:17:29 2016 +0100
+
+    Update Time_Value.inl
+    
+    - Handle big positiv and negativ double values by limiting them to possible values for sec and usec
+    - Correct round for negativ double values: -10.5 => -10 -500000 (not -10 -499999)
+    - no normalize needed cause result is already normalized
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index 8eb9c59169e..20bd0d570d9 100644
--- a/ACE/PROBLEM-REPORT-FORM
+++ b/ACE/PROBLEM-REPORT-FORM
@@ -40,7 +40,7 @@
 To: ace-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 6.4.0
+    ACE VERSION: 6.4.1
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/ACE/VERSION b/ACE/VERSION
index c369d605ae4..d215dcf5d17 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 6.4.0, released Mon Jul 04 08:47:38 CEST 2016
+This is ACE version 6.4.1, released Mon Oct 10 09:17:08 CEST 2016
 
 If you have any problems with or questions about ACE, please send
 e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu),
diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h
index 64ff78ae92a..7877751d314 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -4,9 +4,9 @@
 
 #define ACE_MAJOR_VERSION 6
 #define ACE_MINOR_VERSION 4
-#define ACE_MICRO_VERSION 0
-#define ACE_BETA_VERSION 0
-#define ACE_VERSION "6.4.0"
-#define ACE_VERSION_CODE 394240
+#define ACE_MICRO_VERSION 1
+#define ACE_BETA_VERSION 1
+#define ACE_VERSION "6.4.1"
+#define ACE_VERSION_CODE 394241
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 
diff --git a/ACE/debian/ace.dsc b/ACE/debian/ace.dsc
index 13703a5419d..ba6e3794fe0 100644
--- a/ACE/debian/ace.dsc
+++ b/ACE/debian/ace.dsc
@@ -1,10 +1,10 @@
 Format: 1.0
-Source: ACE+TAO-src-6.4.0
-Version: 2.4.0
+Source: ACE+TAO-src-6.4.1
+Version: 2.4.1
 Binary: ace
 Maintainer: Johnny Willemsen  <jwillemsen@remedy.nl>
 Architecture: any
 Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev, libzzip-dev, libbz2-dev
 Files:
- 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO-src-6.4.0.tar.gz
+ 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO-src-6.4.1.tar.gz
 
diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control
index bbf1e371bc0..b243b513490 100644
--- a/ACE/debian/debian.control
+++ b/ACE/debian/debian.control
@@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator
   * mpc-ace: generates project files for a single target
   * mwc-ace: generates workspace files for a set of projects
 
-Package: libace-6.4.0
+Package: libace-6.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -45,7 +45,7 @@ Description: C++ network programming framework
 Package: libace-dev
 Architecture: any
 Section: libdevel
-Depends: libace-6.4.0 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.4.1 (= ${binary:Version}), ${misc:Depends}
 Suggests: libace-doc, libtao-dev, pkg-config
 Replaces: mpc-ace (<< 5.6.3-4)
 Description: C++ network programming framework - development files
@@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation
  This package contains the ACE overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libace-ssl-6.4.0
+Package: libace-ssl-6.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -73,12 +73,12 @@ Description: ACE secure socket layer library
 Package: libace-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-ssl-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.4.0d), ${misc:Depends}
+Depends: libace-ssl-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.4.1d), ${misc:Depends}
 Description: ACE secure socket layer library - development files
  This package contains the header files and static library for the ACE
  SSL library.
 
-Package: libace-rmcast-6.4.0
+Package: libace-rmcast-6.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -92,12 +92,12 @@ Description: ACE reliable multicast library
 Package: libace-rmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-rmcast-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE reliable multicast library - development files
  This package contains the header files and static library for the ACE
  reliable multicast library.
 
-Package: libace-tmcast-6.4.0
+Package: libace-tmcast-6.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -111,12 +111,12 @@ Description: ACE transactional multicast library
 Package: libace-tmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tmcast-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE transactional multicast library - development files
  This package contains the header files and static library for the ACE
  transactional multicast library.
 
-Package: libace-htbp-6.4.0
+Package: libace-htbp-6.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library
 Package: libace-htbp-dev
 Architecture: any
 Section: libdevel
-Depends: libace-htbp-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE protocol over HTTP tunneling library - development files
  This package contains the header files and static library for the ACE
  HTBP library.
 
-Package: libace-inet-6.4.0
+Package: libace-inet-6.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -146,15 +146,15 @@ Description: ACE Inet protocol library
 Package: libace-inet-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE Inet protocol library - development files
  This package contains the header files and static library for the ACE
  Inet protocol library.
 
-Package: libace-inet-ssl-6.4.0
+Package: libace-inet-ssl-6.4.1
 Architecture: any
 Section: libs
-Depends: libace-inet-6.4.0, libace-ssl-6.4.0, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.4.0, libace-ssl-6.4.1, ${shlibs:Depends}, ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library
  This package provides an ACE addon library for clients (and possibly
  servers at some point) using Inet protocols which support SSL, such as
@@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library
 Package: libace-inet-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-ssl-6.4.0 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.4.1 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library - development files
  This package contains the header files and static library for the ACE
  SSL-enabled Inet protocol library.
@@ -190,7 +190,7 @@ Description: ACE perfect hash function generator (transitional package)
  .
  It can be safely removed after installation.
 
-Package: libacexml-6.4.0
+Package: libacexml-6.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -206,12 +206,12 @@ Package: libacexml-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libacexml-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SAX based XML parsing library - development files
  This package contains the header files and static library for the ACE
  XML parsing library.
 
-Package: libace-xml-utils-6.4.0
+Package: libace-xml-utils-6.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -225,16 +225,16 @@ Package: libace-xml-utils-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libace-xml-utils-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
 Description: ACE XML utility classes and methods - development files
  This package contains the header files and static library for the ACE XML
  Utils library
 
-Package: libkokyu-6.4.0
+Package: libkokyu-6.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libtao-2.2.7, libtao-orbsvcs-2.4.0
+Suggests: libtao-2.2.7, libtao-orbsvcs-2.4.1
 Description: ACE scheduling and dispatching library
  Kokyu is a library designed to provide flexible scheduling and
  dispatching services.
@@ -245,12 +245,12 @@ Description: ACE scheduling and dispatching library
 Package: libkokyu-dev
 Architecture: any
 Section: libdevel
-Depends: libkokyu-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE scheduling and dispatching library - development files
  This package contains the header files and static library for the ACE
  scheduling and dispatching library.
 
-Package: libace-qtreactor-6.4.0
+Package: libace-qtreactor-6.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -269,12 +269,12 @@ Description: ACE-GUI reactor integration for Qt
 Package: libace-qtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-qtreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends}
+Depends: libace-qtreactor-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends}
 Description: ACE-GUI reactor integration for Qt - development files
  This package contains header files and static library for the ACE-Qt
  reactor integration.
 
-Package: libace-xtreactor-6.4.0
+Package: libace-xtreactor-6.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -292,12 +292,12 @@ Description: ACE-GUI reactor integration for Xt
 Package: libace-xtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-xtreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.4.0), ${misc:Depends}
+Depends: libace-xtreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.4.1), ${misc:Depends}
 Description: ACE-GUI reactor integration for Xt - development files
  This package contains header files and static library for the ACE-Xt
  reactor integration.
 
-Package: libace-tkreactor-6.4.0
+Package: libace-tkreactor-6.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -316,12 +316,12 @@ Description: ACE-GUI reactor integration for Tk
 Package: libace-tkreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tkreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
 Description: ACE-GUI reactor integration for Tk - development files
  This package contains header files and static library for the ACE-Tk
  reactor integration.
 
-Package: libace-flreactor-6.4.0
+Package: libace-flreactor-6.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -339,12 +339,12 @@ Description: ACE-GUI reactor integration for FLTK
 Package: libace-flreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-flreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.4.0), ${misc:Depends}
+Depends: libace-flreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.4.1), ${misc:Depends}
 Description: ACE-GUI reactor integration for FLTK - development files
  This package contains header files and static library for the ACE-FLTK
  reactor integration.
 
-Package: libace-foxreactor-6.4.0
+Package: libace-foxreactor-6.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -361,12 +361,12 @@ Description: ACE-GUI reactor integration for FOX
 Package: libace-foxreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-foxreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
 Description: ACE-GUI reactor integration for FOX - development files
  This package contains header files and static library for the ACE-FOX
  reactor integration.
 
-Package: libtao-2.4.0
+Package: libtao-2.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -381,7 +381,7 @@ Package: libtao-dev
 Architecture: any
 Section: libdevel
 Replaces: libtao-orbsvcs-dev (<< 5.7.7-4)
-Depends: libtao-2.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-2.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Suggests: libtao-doc, libtao-orbsvcs-dev
 Description: ACE based CORBA ORB core libraries - development files
  This package contains the header files for TAO. Due to the size of
@@ -397,7 +397,7 @@ Description: ACE based CORBA ORB core libraries - documentation
  This package contains the TAO overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libtao-orbsvcs-2.4.0
+Package: libtao-orbsvcs-2.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -408,14 +408,14 @@ Package: libtao-orbsvcs-dev
 Architecture: any
 Section: libdevel
 Replaces: libtao-dev (<< 5.7.7-4)
-Depends: libtao-orbsvcs-2.4.0 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-orbsvcs-2.4.1 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO CORBA services - development files
  This package contains the header files for the TAO CORBA services.
  .
  The examples and some documentation have been included as well, but the
  static libraries have been left out due to their size (over 400MB).
 
-Package: libtao-qtresource-2.4.0
+Package: libtao-qtresource-2.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -426,12 +426,12 @@ Description: TAO-GUI reactor integration for Qt
 Package: libtao-qtresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-qtresource-2.4.0 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-qtresource-2.4.1 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Qt - development files
  This package contains header files and static library for the TAO-Qt
  reactor integration.
 
-Package: libtao-xtresource-2.4.0
+Package: libtao-xtresource-2.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -442,12 +442,12 @@ Description: TAO-GUI reactor integration for Xt
 Package: libtao-xtresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-xtresource-2.4.0 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-xtresource-2.4.1 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Xt - development files
  This package contains header files and static library for the TAO-Xt
  reactor integration.
 
-Package: libtao-flresource-2.4.0
+Package: libtao-flresource-2.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -458,12 +458,12 @@ Description: TAO-GUI reactor integration for FLTK
 Package: libtao-flresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-flresource-2.4.0 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-flresource-2.4.1 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for FLTK - development files
  This package contains header files and static library for the TAO-FLTK
  reactor integration.
 
-Package: libtao-tkresource-2.4.0
+Package: libtao-tkresource-2.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -474,12 +474,12 @@ Description: TAO-GUI reactor integration for Tk
 Package: libtao-tkresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-tkresource-2.4.0 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-tkresource-2.4.1 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Tk - development files
  This package contains header files and static library for the TAO-Tk
  reactor integration.
 
-Package: libtao-foxresource-2.4.0
+Package: libtao-foxresource-2.4.1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -490,14 +490,14 @@ Description: TAO-GUI reactor integration for FOX
 Package: libtao-foxresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-foxresource-2.4.0 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-foxresource-2.4.1 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for FOX - development files
  This package contains header files and static library for the TAO-FOX
  reactor integration.
 
 Package: tao-idl
 Architecture: any
-Depends: g++, libtao-2.4.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: g++, libtao-2.4.1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: TAO IDL to C++ compiler
  This package provides an Interface Definition Language (IDL) to C++
  compiler.
@@ -507,7 +507,7 @@ Description: TAO IDL to C++ compiler
 
 Package: tao-ifr
 Architecture: any
-Depends: g++, libtao-2.4.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: g++, libtao-2.4.1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: TAO interface repository
  CORBA-aware programs can contact an interface repository to get
  objects' interfaces at run-time. Then they can use the Dynamic
diff --git a/ACE/debian/libace-6.4.0.docs b/ACE/debian/libace-6.4.1.docs
index 3bdab5b0089..3bdab5b0089 100644
--- a/ACE/debian/libace-6.4.0.docs
+++ b/ACE/debian/libace-6.4.1.docs
diff --git a/ACE/debian/libace-6.4.0.install b/ACE/debian/libace-6.4.1.install
index d9afda38c12..d9afda38c12 100644
--- a/ACE/debian/libace-6.4.0.install
+++ b/ACE/debian/libace-6.4.1.install
diff --git a/ACE/debian/libace-6.4.0.lintian-overrides b/ACE/debian/libace-6.4.1.lintian-overrides
index a734a623241..a734a623241 100644
--- a/ACE/debian/libace-6.4.0.lintian-overrides
+++ b/ACE/debian/libace-6.4.1.lintian-overrides
diff --git a/ACE/debian/libace-flreactor-6.4.0.install b/ACE/debian/libace-flreactor-6.4.1.install
index 528836aacee..528836aacee 100644
--- a/ACE/debian/libace-flreactor-6.4.0.install
+++ b/ACE/debian/libace-flreactor-6.4.1.install
diff --git a/ACE/debian/libace-flreactor-6.4.0.lintian-overrides b/ACE/debian/libace-flreactor-6.4.1.lintian-overrides
index 1b84bf197dc..1b84bf197dc 100644
--- a/ACE/debian/libace-flreactor-6.4.0.lintian-overrides
+++ b/ACE/debian/libace-flreactor-6.4.1.lintian-overrides
diff --git a/ACE/debian/libace-foxreactor-6.4.0.install b/ACE/debian/libace-foxreactor-6.4.1.install
index e360f29f5af..e360f29f5af 100644
--- a/ACE/debian/libace-foxreactor-6.4.0.install
+++ b/ACE/debian/libace-foxreactor-6.4.1.install
diff --git a/ACE/debian/libace-foxreactor-6.4.0.lintian-overrides b/ACE/debian/libace-foxreactor-6.4.1.lintian-overrides
index 7c835b9b8e0..7c835b9b8e0 100644
--- a/ACE/debian/libace-foxreactor-6.4.0.lintian-overrides
+++ b/ACE/debian/libace-foxreactor-6.4.1.lintian-overrides
diff --git a/ACE/debian/libace-htbp-6.4.0.install b/ACE/debian/libace-htbp-6.4.1.install
index 08103fd5cad..08103fd5cad 100644
--- a/ACE/debian/libace-htbp-6.4.0.install
+++ b/ACE/debian/libace-htbp-6.4.1.install
diff --git a/ACE/debian/libace-htbp-6.4.0.lintian-overrides b/ACE/debian/libace-htbp-6.4.1.lintian-overrides
index 63764ad81ee..63764ad81ee 100644
--- a/ACE/debian/libace-htbp-6.4.0.lintian-overrides
+++ b/ACE/debian/libace-htbp-6.4.1.lintian-overrides
diff --git a/ACE/debian/libace-inet-6.4.0.install b/ACE/debian/libace-inet-6.4.1.install
index 59a73a509d0..59a73a509d0 100644
--- a/ACE/debian/libace-inet-6.4.0.install
+++ b/ACE/debian/libace-inet-6.4.1.install
diff --git a/ACE/debian/libace-inet-6.4.0.lintian-overrides b/ACE/debian/libace-inet-6.4.1.lintian-overrides
index a801058e382..a801058e382 100644
--- a/ACE/debian/libace-inet-6.4.0.lintian-overrides
+++ b/ACE/debian/libace-inet-6.4.1.lintian-overrides
diff --git a/ACE/debian/libace-inet-ssl-6.4.0.install b/ACE/debian/libace-inet-ssl-6.4.1.install
index b9b8b9045f7..b9b8b9045f7 100644
--- a/ACE/debian/libace-inet-ssl-6.4.0.install
+++ b/ACE/debian/libace-inet-ssl-6.4.1.install
diff --git a/ACE/debian/libace-inet-ssl-6.4.0.lintian-overrides b/ACE/debian/libace-inet-ssl-6.4.1.lintian-overrides
index c105861e8c8..c105861e8c8 100644
--- a/ACE/debian/libace-inet-ssl-6.4.0.lintian-overrides
+++ b/ACE/debian/libace-inet-ssl-6.4.1.lintian-overrides
diff --git a/ACE/debian/libace-qtreactor-6.4.0.install b/ACE/debian/libace-qtreactor-6.4.1.install
index 1d371e1e571..1d371e1e571 100644
--- a/ACE/debian/libace-qtreactor-6.4.0.install
+++ b/ACE/debian/libace-qtreactor-6.4.1.install
diff --git a/ACE/debian/libace-qtreactor-6.4.0.lintian-overrides b/ACE/debian/libace-qtreactor-6.4.1.lintian-overrides
index 08d9151dbd6..08d9151dbd6 100644
--- a/ACE/debian/libace-qtreactor-6.4.0.lintian-overrides
+++ b/ACE/debian/libace-qtreactor-6.4.1.lintian-overrides
diff --git a/ACE/debian/libace-rmcast-6.4.0.install b/ACE/debian/libace-rmcast-6.4.1.install
index 86e78259853..86e78259853 100644
--- a/ACE/debian/libace-rmcast-6.4.0.install
+++ b/ACE/debian/libace-rmcast-6.4.1.install
diff --git a/ACE/debian/libace-rmcast-6.4.0.lintian-overrides b/ACE/debian/libace-rmcast-6.4.1.lintian-overrides
index 9644f06518a..9644f06518a 100644
--- a/ACE/debian/libace-rmcast-6.4.0.lintian-overrides
+++ b/ACE/debian/libace-rmcast-6.4.1.lintian-overrides
diff --git a/ACE/debian/libace-ssl-6.4.0.NEWS b/ACE/debian/libace-ssl-6.4.1.NEWS
index e5bd0e4aa10..e5bd0e4aa10 100644
--- a/ACE/debian/libace-ssl-6.4.0.NEWS
+++ b/ACE/debian/libace-ssl-6.4.1.NEWS
diff --git a/ACE/debian/libace-ssl-6.4.0.install b/ACE/debian/libace-ssl-6.4.1.install
index 8df45a6d55f..8df45a6d55f 100644
--- a/ACE/debian/libace-ssl-6.4.0.install
+++ b/ACE/debian/libace-ssl-6.4.1.install
diff --git a/ACE/debian/libace-ssl-6.4.0.lintian-overrides b/ACE/debian/libace-ssl-6.4.1.lintian-overrides
index e8ea7ddcf34..e8ea7ddcf34 100644
--- a/ACE/debian/libace-ssl-6.4.0.lintian-overrides
+++ b/ACE/debian/libace-ssl-6.4.1.lintian-overrides
diff --git a/ACE/debian/libace-tkreactor-6.4.0.install b/ACE/debian/libace-tkreactor-6.4.1.install
index 12ab35062d2..12ab35062d2 100644
--- a/ACE/debian/libace-tkreactor-6.4.0.install
+++ b/ACE/debian/libace-tkreactor-6.4.1.install
diff --git a/ACE/debian/libace-tkreactor-6.4.0.lintian-overrides b/ACE/debian/libace-tkreactor-6.4.1.lintian-overrides
index 0be73cb750c..0be73cb750c 100644
--- a/ACE/debian/libace-tkreactor-6.4.0.lintian-overrides
+++ b/ACE/debian/libace-tkreactor-6.4.1.lintian-overrides
diff --git a/ACE/debian/libace-tmcast-6.4.0.install b/ACE/debian/libace-tmcast-6.4.1.install
index e066131dea0..e066131dea0 100644
--- a/ACE/debian/libace-tmcast-6.4.0.install
+++ b/ACE/debian/libace-tmcast-6.4.1.install
diff --git a/ACE/debian/libace-tmcast-6.4.0.lintian-overrides b/ACE/debian/libace-tmcast-6.4.1.lintian-overrides
index 42c1086a791..42c1086a791 100644
--- a/ACE/debian/libace-tmcast-6.4.0.lintian-overrides
+++ b/ACE/debian/libace-tmcast-6.4.1.lintian-overrides
diff --git a/ACE/debian/libace-xml-utils-6.4.0.install b/ACE/debian/libace-xml-utils-6.4.1.install
index 2428ec9f109..2428ec9f109 100644
--- a/ACE/debian/libace-xml-utils-6.4.0.install
+++ b/ACE/debian/libace-xml-utils-6.4.1.install
diff --git a/ACE/debian/libace-xml-utils-6.4.0.lintian-overrides b/ACE/debian/libace-xml-utils-6.4.1.lintian-overrides
index c6d67613a41..c6d67613a41 100644
--- a/ACE/debian/libace-xml-utils-6.4.0.lintian-overrides
+++ b/ACE/debian/libace-xml-utils-6.4.1.lintian-overrides
diff --git a/ACE/debian/libace-xtreactor-6.4.0.install b/ACE/debian/libace-xtreactor-6.4.1.install
index c53614c7208..c53614c7208 100644
--- a/ACE/debian/libace-xtreactor-6.4.0.install
+++ b/ACE/debian/libace-xtreactor-6.4.1.install
diff --git a/ACE/debian/libace-xtreactor-6.4.0.lintian-overrides b/ACE/debian/libace-xtreactor-6.4.1.lintian-overrides
index 3bb1f71096e..3bb1f71096e 100644
--- a/ACE/debian/libace-xtreactor-6.4.0.lintian-overrides
+++ b/ACE/debian/libace-xtreactor-6.4.1.lintian-overrides
diff --git a/ACE/debian/libacexml-6.4.0.docs b/ACE/debian/libacexml-6.4.1.docs
index 002855d7915..002855d7915 100644
--- a/ACE/debian/libacexml-6.4.0.docs
+++ b/ACE/debian/libacexml-6.4.1.docs
diff --git a/ACE/debian/libacexml-6.4.0.install b/ACE/debian/libacexml-6.4.1.install
index d3e912ffa51..d3e912ffa51 100644
--- a/ACE/debian/libacexml-6.4.0.install
+++ b/ACE/debian/libacexml-6.4.1.install
diff --git a/ACE/debian/libacexml-6.4.0.lintian-overrides b/ACE/debian/libacexml-6.4.1.lintian-overrides
index 90f4b3eb86c..90f4b3eb86c 100644
--- a/ACE/debian/libacexml-6.4.0.lintian-overrides
+++ b/ACE/debian/libacexml-6.4.1.lintian-overrides
diff --git a/ACE/debian/libkokyu-6.4.0.docs b/ACE/debian/libkokyu-6.4.1.docs
index e8869c513b2..e8869c513b2 100644
--- a/ACE/debian/libkokyu-6.4.0.docs
+++ b/ACE/debian/libkokyu-6.4.1.docs
diff --git a/ACE/debian/libkokyu-6.4.0.install b/ACE/debian/libkokyu-6.4.1.install
index 62854308f96..62854308f96 100644
--- a/ACE/debian/libkokyu-6.4.0.install
+++ b/ACE/debian/libkokyu-6.4.1.install
diff --git a/ACE/debian/libkokyu-6.4.0.lintian-overrides b/ACE/debian/libkokyu-6.4.1.lintian-overrides
index b01f2e10dfd..b01f2e10dfd 100644
--- a/ACE/debian/libkokyu-6.4.0.lintian-overrides
+++ b/ACE/debian/libkokyu-6.4.1.lintian-overrides
diff --git a/ACE/debian/libtao-2.4.0.docs b/ACE/debian/libtao-2.4.1.docs
index 803353aba72..803353aba72 100644
--- a/ACE/debian/libtao-2.4.0.docs
+++ b/ACE/debian/libtao-2.4.1.docs
diff --git a/ACE/debian/libtao-2.4.0.install b/ACE/debian/libtao-2.4.1.install
index a9643d351fb..a9643d351fb 100644
--- a/ACE/debian/libtao-2.4.0.install
+++ b/ACE/debian/libtao-2.4.1.install
diff --git a/ACE/debian/libtao-2.4.0.lintian-overrides b/ACE/debian/libtao-2.4.1.lintian-overrides
index 77cc51ec2ff..77cc51ec2ff 100644
--- a/ACE/debian/libtao-2.4.0.lintian-overrides
+++ b/ACE/debian/libtao-2.4.1.lintian-overrides
diff --git a/ACE/debian/libtao-flresource-2.4.0.install b/ACE/debian/libtao-flresource-2.4.1.install
index 5d4ee6ce57a..5d4ee6ce57a 100644
--- a/ACE/debian/libtao-flresource-2.4.0.install
+++ b/ACE/debian/libtao-flresource-2.4.1.install
diff --git a/ACE/debian/libtao-flresource-2.4.0.lintian-overrides b/ACE/debian/libtao-flresource-2.4.1.lintian-overrides
index 28b7907f70b..28b7907f70b 100644
--- a/ACE/debian/libtao-flresource-2.4.0.lintian-overrides
+++ b/ACE/debian/libtao-flresource-2.4.1.lintian-overrides
diff --git a/ACE/debian/libtao-foxresource-2.4.0.install b/ACE/debian/libtao-foxresource-2.4.1.install
index 6ceb47601aa..6ceb47601aa 100644
--- a/ACE/debian/libtao-foxresource-2.4.0.install
+++ b/ACE/debian/libtao-foxresource-2.4.1.install
diff --git a/ACE/debian/libtao-foxresource-2.4.0.lintian-overrides b/ACE/debian/libtao-foxresource-2.4.1.lintian-overrides
index 0e291526088..0e291526088 100644
--- a/ACE/debian/libtao-foxresource-2.4.0.lintian-overrides
+++ b/ACE/debian/libtao-foxresource-2.4.1.lintian-overrides
diff --git a/ACE/debian/libtao-orbsvcs-2.4.0.NEWS b/ACE/debian/libtao-orbsvcs-2.4.1.NEWS
index ea0759e0ade..ea0759e0ade 100644
--- a/ACE/debian/libtao-orbsvcs-2.4.0.NEWS
+++ b/ACE/debian/libtao-orbsvcs-2.4.1.NEWS
diff --git a/ACE/debian/libtao-orbsvcs-2.4.0.install b/ACE/debian/libtao-orbsvcs-2.4.1.install
index 270eb6a9174..270eb6a9174 100644
--- a/ACE/debian/libtao-orbsvcs-2.4.0.install
+++ b/ACE/debian/libtao-orbsvcs-2.4.1.install
diff --git a/ACE/debian/libtao-orbsvcs-2.4.0.lintian-overrides b/ACE/debian/libtao-orbsvcs-2.4.1.lintian-overrides
index 8f357d027bf..8f357d027bf 100644
--- a/ACE/debian/libtao-orbsvcs-2.4.0.lintian-overrides
+++ b/ACE/debian/libtao-orbsvcs-2.4.1.lintian-overrides
diff --git a/ACE/debian/libtao-qtresource-2.4.0.install b/ACE/debian/libtao-qtresource-2.4.1.install
index 172f4c45db8..172f4c45db8 100644
--- a/ACE/debian/libtao-qtresource-2.4.0.install
+++ b/ACE/debian/libtao-qtresource-2.4.1.install
diff --git a/ACE/debian/libtao-qtresource-2.4.0.lintian-overrides b/ACE/debian/libtao-qtresource-2.4.1.lintian-overrides
index d7c2f9dac9f..d7c2f9dac9f 100644
--- a/ACE/debian/libtao-qtresource-2.4.0.lintian-overrides
+++ b/ACE/debian/libtao-qtresource-2.4.1.lintian-overrides
diff --git a/ACE/debian/libtao-tkresource-2.4.0.install b/ACE/debian/libtao-tkresource-2.4.1.install
index 7f543154b5b..7f543154b5b 100644
--- a/ACE/debian/libtao-tkresource-2.4.0.install
+++ b/ACE/debian/libtao-tkresource-2.4.1.install
diff --git a/ACE/debian/libtao-tkresource-2.4.0.lintian-overrides b/ACE/debian/libtao-tkresource-2.4.1.lintian-overrides
index 94627217c4e..94627217c4e 100644
--- a/ACE/debian/libtao-tkresource-2.4.0.lintian-overrides
+++ b/ACE/debian/libtao-tkresource-2.4.1.lintian-overrides
diff --git a/ACE/debian/libtao-xtresource-2.4.0.install b/ACE/debian/libtao-xtresource-2.4.1.install
index ab5151ed073..ab5151ed073 100644
--- a/ACE/debian/libtao-xtresource-2.4.0.install
+++ b/ACE/debian/libtao-xtresource-2.4.1.install
diff --git a/ACE/debian/libtao-xtresource-2.4.0.lintian-overrides b/ACE/debian/libtao-xtresource-2.4.1.lintian-overrides
index 3b0d1808c3c..3b0d1808c3c 100644
--- a/ACE/debian/libtao-xtresource-2.4.0.lintian-overrides
+++ b/ACE/debian/libtao-xtresource-2.4.1.lintian-overrides
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index 0d4c163cb9f..92d164fc9e0 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -1,6 +1,6 @@
 # Set the version number here.
-%define ACEVER  6.4.0
-%define TAOVER  2.4.0
+%define ACEVER  6.4.1
+%define TAOVER  2.4.1
 
 # Conditional build
 # Default values are
diff --git a/TAO/ChangeLogs/TAO-2_4_1 b/TAO/ChangeLogs/TAO-2_4_1
new file mode 100644
index 00000000000..4edd49eff78
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_4_1
@@ -0,0 +1,251 @@
+commit 999c2d14947c0e6f67061972cc8971789c5acbb4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Oct 4 12:07:48 2016 +0200
+
+    Extended list of user visible changes
+        * ACE/NEWS:
+        * TAO/NEWS:
+
+commit 668e749f2e66f540932c15078be44e14c5e43016
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Sep 30 12:38:23 2016 -0500
+
+    Fixed parallel build error
+
+commit f1e42feed37f849562a1782f7f80a8ad371a3e46
+Author: Huang-Ming Huang <huangh@ociweb.com>
+Date:   Thu Sep 22 16:38:33 2016 -0500
+
+    Remove null reference checks
+
+commit 9ef7b1dd9a1ac4181df901f81bd134b53884181b
+Author: Huang-Ming Huang <huangh@ociweb.com>
+Date:   Thu Sep 22 14:31:36 2016 -0500
+
+    Fix some fuzz errors
+
+commit 7a3126ae033cfab39c26ce38ad6112cf51e92f0d
+Author: Huang-Ming Huang <huangh@ociweb.com>
+Date:   Thu Sep 22 12:19:56 2016 -0500
+
+    Fix issues with explicit template instantiation with versioned namespace
+
+commit eb42ae1e7cbce5863f79e4519befccb13e8f9018
+Author: Huang-Ming Huang <huangh@ociweb.com>
+Date:   Wed Sep 21 14:29:22 2016 -0500
+
+    Fixed all explicit singleton template instantiation
+
+commit d4e368c76124dc6dea13e33f92411aef17197fca
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 15 16:20:00 2016 +0200
+
+    Mark the IFRService persistence test with !FIXED_BUGS_ONLY, it fails frequently which goes back to 2009, see bugzilla 3699
+        * TAO/bin/tao_other_tests.lst:
+
+commit 5385cbc61f1ce880b06abd2960265297753f53cc
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 15 16:00:48 2016 +0200
+
+    Cleanup
+        * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
+        * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h:
+        * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp:
+        * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl:
+
+commit 87671627d5de5ed9c4a5dd06c4e1f7710ecba9eb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 15 16:00:08 2016 +0200
+
+    Removed not needed variable
+        * TAO/orbsvcs/IFR_Service/IFR_Service.h:
+
+commit cdf54724dea3807bfd5ed0773b11838048c2cf3a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 15 15:41:09 2016 +0200
+
+    Zapped some empty lines
+        * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/README:
+
+commit 616babd5d1d50df61646b23bb6b4200f70dffe45
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 15 15:40:52 2016 +0200
+
+    Added shutdown to cleanly shutdown the ORB and release all CORBA resources to resolve several valgrind reported memory leaks
+        * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp:
+        * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h:
+        * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp:
+
+commit 21737cc4d46d96e3b2c527b60277caf1bf4c3749
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 14 15:50:06 2016 +0200
+
+    Initialise member
+        * TAO/tao/Messaging/AMH_Response_Handler.cpp:
+
+commit 4be7a6680d28a33c81773e464e1c58c9d719e458
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 14 15:48:07 2016 +0200
+
+    Check the return value of get_component
+        * TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp:
+
+commit bbd816c5ddf6a8f44ccf6d5af520e134f578028b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 14 15:47:46 2016 +0200
+
+    Fixed coverity errors, initialize pointers
+        * TAO/tao/HTTP_Client.cpp:
+        * TAO/tao/HTTP_Handler.cpp:
+
+commit 5f217dc03ff7bb574f281056b2d526b50863d65b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 14 11:23:37 2016 +0200
+
+    Fixed memory leaks reported by Coverity
+        * TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
+        * TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp:
+
+commit ac6416f590563684d6ba660ddb89bd13c0842c70
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 14 11:02:02 2016 +0200
+
+    Use own_factory_ at the moment to cleanup to delete the factory at the moment we own it at destruction, fixes coverity errors
+        * TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp:
+
+commit 5382791dbaa61a859cc4b8e6746b86c183d4f5b3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 14 11:01:35 2016 +0200
+
+    Initialise value with 0 to fix Coverity error
+        * TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp:
+
+commit f3387d02b2617c272300f22f2ae7a5864065997f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Sep 4 19:20:58 2016 +0200
+
+    Fixed warning
+        * TAO/utils/logWalker/Invocation.cpp:
+
+commit 03ef5706e8b3dcdd8de7636f39aaca7543b23283
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 2 20:53:02 2016 +0200
+
+    Revert "*_SINGLETON_DECLARE needs to appear in .cpp files, not .h."
+    
+    This reverts commit 411929ec7d2550f289eb1a2f045f2fc6651cb002.
+
+commit 1004be5609bb7842835d865422c65332d08425ee
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 2 20:52:39 2016 +0200
+
+    Revert "Updated previous change to TAO_AV_Core for versioned namespaces"
+    
+    This reverts commit 62cc01c2cc61f0da9618056e825274ec481a7686.
+
+commit 09cb0cc2e512ebcd3eba1a784dcf460568339d3f
+Merge: d1463d5 c96749e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 2 19:45:00 2016 +0200
+
+    Merge branch 'master' of git://github.com/DOCGroup/ATCD
+
+commit d1463d5340978fac91d662c8518a40aee1430721
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 2 19:44:53 2016 +0200
+
+    Initialise pointer with 0
+        * TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp:
+
+commit fe1f3dfb843c1480f0b9639efacf36be64bc0a4d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 2 19:44:41 2016 +0200
+
+    Documentation changes
+        * TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h:
+        * TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h:
+        * TAO/orbsvcs/orbsvcs/Notify/Properties.h:
+
+commit c96749ebafa25b5660884e9071bf178837b53298
+Merge: 62cc01c 068b865
+Author: Johnny Willemsen <jwillemsen@users.noreply.github.com>
+Date:   Wed Aug 31 18:54:50 2016 +0200
+
+    Merge pull request #286 from jwillemsen/master
+    
+    Documentation changes
+
+commit 068b86554f9954b3270d6e263adbc817c6b733fa
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 31 11:48:02 2016 +0200
+
+    Documentation changes
+
+commit 62cc01c2cc61f0da9618056e825274ec481a7686
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Wed Aug 24 17:17:26 2016 -0500
+
+    Updated previous change to TAO_AV_Core for versioned namespaces
+
+commit 411929ec7d2550f289eb1a2f045f2fc6651cb002
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Wed Aug 24 15:40:44 2016 -0500
+
+    *_SINGLETON_DECLARE needs to appear in .cpp files, not .h.
+    
+    This prevents multiple definition of typeinfo symbols during linking,
+    only seen on arm-linux-gnueabihf-g++ but the code is invalid C++ on
+    all platforms.
+
+commit 18cb08464abc1d506ae5c9d50c0428229f8653f6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 13:40:32 2016 +0200
+
+    Fixed typo
+        * TAO/orbsvcs/tests/AVStreams/Pluggable/server.h:
+
+commit ad958e7639275dc8626599ac0bfcc805a7e4ea76
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 13:28:52 2016 +0200
+
+    Fixed typos
+        * ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp:
+        * ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp:
+        * ACE/examples/QOS/Simple/QoS_Util.cpp:
+        * TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h:
+        * TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h:
+        * TAO/orbsvcs/tests/AVStreams/Pluggable/server.h:
+
+commit 7664aa6b6c0f77ff5cdc01b16c1fe22c800dbd56
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 5 10:22:26 2016 +0200
+
+    Fixed typo and layout change
+        * TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp:
+        * TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp:
+
+commit b169ad5ff5c2fe5e0b92f96f871bd568e3e18bcf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Aug 2 15:37:58 2016 +0200
+
+    Indent changes to fix gcc 6.1 warnings
+        * TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp:
+
+commit 602c0b17174fd84710f8730ad905a9014ec1e84b
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Wed Jul 6 13:32:00 2016 -0500
+
+    Fix bugzilla #4215: workaround for a compiler bug in vc14-update3
+
+commit da68e30dd6e6939b6aade74c46e25ca8594d7182
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 08:58:23 2016 +0200
+
+    Prepare for next release
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 3dfcb5081b9..2170dc953ea 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -40,8 +40,8 @@
 To: tao-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 2.4.0
-    ACE VERSION: 6.4.0
+    TAO VERSION: 2.4.1
+    ACE VERSION: 6.4.1
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/VERSION b/TAO/VERSION
index 414d9712c3b..893cb03dfe7 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 2.4.0, released Mon Jul 04 08:47:38 CEST 2016
+This is TAO version 2.4.1, released Mon Oct 10 09:17:08 CEST 2016
 
 If you have any problems with or questions about TAO, please send
 e-mail to the TAO mailing list (tao-bugs@list.isis.vanderbilt.edu),
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 5366141b2d1..9d4d089eb98 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -4,9 +4,9 @@
 
 #define TAO_MAJOR_VERSION 2
 #define TAO_MINOR_VERSION 4
-#define TAO_MICRO_VERSION 0
-#define TAO_BETA_VERSION 0
-#define TAO_VERSION "2.4.0"
-#define TAO_VERSION_CODE 132096
+#define TAO_MICRO_VERSION 1
+#define TAO_BETA_VERSION 1
+#define TAO_VERSION "2.4.1"
+#define TAO_VERSION_CODE 132097
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))