diff --git a/AUTHORS.txt b/AUTHORS.txt
index 14822d2bd..1c4d9a2c0 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,6 +1,6 @@
-OpenSceneGraph Library 3.5.4
+OpenSceneGraph Library 3.5.5
 
-584 Contributors:
+583 Contributors:
 
 Firstname Surname
 -----------------
@@ -17,11 +17,11 @@ Marco Jez
 Sukender
 Eric Wing
 Cedric Pinson
+Laurens Voerman
 Brede Johansen
 Bob Kuehne
 Wojciech Lewandowski
 Michael Platings
-Laurens Voerman
 Geoff Michel
 Eric Sokolowsky
 David Callu
@@ -465,7 +465,6 @@ Louis Hamilton
 Likasz Izebski
 Lewis Harmon
 Leigh Stivers
-Laurens Loerman
 Laurence Muller
 Laura Cerritelli
 Kyle Centers
diff --git a/ChangeLog b/ChangeLog
index de5b86ef9..11040c672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,238 @@
+Thu, 29 Sep 2016 14:56:54 +0100
+Author : Robert Osfield
+Fixed extension string typo
+
+Thu, 29 Sep 2016 14:53:10 +0100
+Author : Robert Osfield
+Added support for checking GL_OES_texture_npot
+
+Wed, 28 Sep 2016 20:30:12 +0100
+Author : Robert Osfield
+Added ViewerBase::s/getUseConfigureAffinity(bool flag) to allow users to toggle whether they want the ViewerBase::setUpThreads() method to call ViewerBase::configureAffinity() or not.
+
+Wed, 28 Sep 2016 18:44:58 +0100
+Author : Robert Osfield
+Introduced OpenThreads::Affinity support into osg::Camera, osg::GraphicsContext::Traitse, osgDB::DatabasePager and osgViewer::ViewerBase/Viewer/CompositeViewer.Added ViewerBase::configureAffinity() to help with the setting of the affinity of camera, graphics context and pager threads
+
+
+Tue, 27 Sep 2016 17:52:41 +0100
+Author : Robert Osfield
+Added DatabasePager::setProcessorAffinity(const OpenThreads::Affinity&) support to allow the database threads to have affinity to user controls sets of CPU cores.
+
+Tue, 27 Sep 2016 16:18:53 +0100
+Author : Robert Osfield
+Implemented setting thread affinity for threads that aren't OpenThreads threads, such as main thread
+
+Tue, 27 Sep 2016 15:34:10 +0100
+Author : Robert Osfield
+Added missing export
+
+Tue, 27 Sep 2016 14:38:33 +0100
+Author : Robert Osfield
+First cut of OpenThrads::Affinity support for Win32.
+
+Tue, 27 Sep 2016 10:50:38 +0100
+Author : Robert Osfield
+Introduced new OpenThreads::Affinity class to wrap up specification of thread affinity.Simplified the OpenThreads::SetProcessorAffinityOfCurrentThread/Thread::SetProcessorAffinity() to utilize the new Affinity class
+
+
+Mon, 26 Sep 2016 19:18:15 +0100
+Author : Robert Osfield
+Introduced OpenThreads::SetProcessorAffinityMaskOfCurrentThread(unsigned long cpumask) and Threads::setProcessorAffinityMask(unsigned long cpumask) to allow finer grained control over the CPU affinity.
+
+Fri, 7 Oct 2016 11:13:40 +0100
+Author : Robert Osfield
+Added CullingActive support for Drawable serializer
+
+Thu, 6 Oct 2016 18:27:23 +0100
+Author : Robert Osfield
+Fixed crash and double call bug in handle event callbacks attached to Drawable
+
+Thu, 6 Oct 2016 15:07:42 +0100
+Author : Robert Osfield
+Added a osgCmakeExample to illustrate a minimal CMakeList.txt to show how to build an OSG application using Cmake
+
+Thu, 6 Oct 2016 14:14:02 +0100
+Author : OpenSceneGraph git repository
+Merge pull request #148 from LaurensVoerman/SmoothingVisitorfix bug in SmoothingVisitor tripped by bunny.ply
+after duplicating the vertices to allow for multiple normals the indices of the new mesh (with duplicated vertices) were used with the vertices of the old mesh, causing a vector subscript out of range error.
+
+Thu, 6 Oct 2016 14:21:07 +0200
+Author : Laurens Voerman
+fix bug in SmoothingVisitor tripped by bunny.ply
+
+Thu, 6 Oct 2016 11:36:06 +0100
+Author : Robert Osfield
+Merge branch 'LaurensVoerman-Submissions_B'
+
+Thu, 6 Oct 2016 11:34:53 +0100
+Author : Robert Osfield
+Changed tabs to four spaces to avoid different editors rendering the indentation differently
+
+Thu, 6 Oct 2016 11:32:31 +0100
+Author : Robert Osfield
+Merge branch 'Submissions_B' of https://github.com/LaurensVoerman/OpenSceneGraph into LaurensVoerman-Submissions_B
+
+Thu, 6 Oct 2016 10:48:29 +0100
+Author : Robert Osfield
+Added GL_OES_geometry_shader and GL_OES_tessellation_shader checks
+
+Fri, 30 Sep 2016 14:59:51 +0200
+Author : Laurens Voerman
+adaptations for cmake changes mid 2015 (SelectLibraryConfigurations.cmake) with SelectLibraryConfigurations.cmake collada zlib debug library linking added
+
+Wed, 5 Oct 2016 16:31:23 +0100
+Author : René Molenaar
+Fixed VisualStudio build
+
+Wed, 5 Oct 2016 14:00:46 +0100
+Author : Robert Osfield
+Removed the unused debug header as it was causing building compile problems with the Debug build under Windows
+
+Mon, 3 Oct 2016 08:45:23 +0100
+Author : OpenSceneGraph git repository
+Merge pull request #145 from LaurensVoerman/Submissions_Aadded vc14 (Visual Studio 2015) and boost 1.58 support in FindCOLLADA.cmake
+
+Fri, 30 Sep 2016 14:33:28 +0200
+Author : Laurens Voerman
+added vc14 (Visual Studio 2015) and boost 1.58 support in FindCOLLADA.cmake
+
+Tue, 27 Sep 2016 09:48:38 +0100
+Author : OpenSceneGraph git repository
+Merge pull request #142 from LaurensVoerman/Submissions12fix a few minor warnings from Visual Studio 2015
+
+Mon, 26 Sep 2016 13:56:38 +0200
+Author : Laurens Voerman
+src\osgplugins\osgjs\Animation(9): warning C4099: 'WriteVisitor': type name first seen using 'class' now seen using 'struct'
+
+Mon, 26 Sep 2016 13:43:51 +0200
+Author : Laurens Voerman
+fix Visual studio warning C4138: '*/' found outside of comment
+
+Mon, 26 Sep 2016 10:03:32 +0100
+Author : Robert Osfield
+Removed __sgi blocks as IRIX is no longer available
+
+Mon, 26 Sep 2016 09:31:22 +0100
+Author : Robert Osfield
+Removed Qt dependency examples, osgQt NodeKit and qfont plugin as these are now provided by the separate osgQt project
+
+Mon, 26 Sep 2016 09:22:10 +0100
+Author : Robert Osfield
+Removed qt threads
+
+Mon, 26 Sep 2016 09:08:56 +0100
+Author : Robert Osfield
+Removed IRIX Sproc thead support as IRIX is load dead
+
+Mon, 26 Sep 2016 09:06:28 +0100
+Author : Robert Osfield
+Removed IRIX Sproc threading support form OpenThreads as IRIX is long dead.
+
+Sat, 24 Sep 2016 16:16:23 +0100
+Author : OpenSceneGraph git repository
+Merge pull request #139 from aluaces/signedcharExplicit signed char declarations for portability.
+
+Sat, 24 Sep 2016 12:33:37 +0200
+Author : Alberto Luaces
+Explicit signed char declarations for portability.Some platforms (ARM, PowerPC, s390x) have "unsigned char" as the default
+char type, and thus the build fails for certain parts of the code where
+negative values are assigned to those kind of variables.
+
+
+Thu, 22 Sep 2016 18:33:35 +0100
+Author : Robert Osfield
+Changed the min CMake version to 2.8.0
+
+Thu, 22 Sep 2016 17:48:19 +0100
+Author : OpenSceneGraph git repository
+Merge pull request #137 from LaurensVoerman/Submissions10fix error in CmakeLists: CMAKE_CXX_COMPILER_VERSIO
+
+Thu, 22 Sep 2016 14:33:03 +0100
+Author : Robert Osfield
+Replaced local static usage to avoid threading and mulit-context issues
+
+Thu, 22 Sep 2016 09:09:46 +0200
+Author : Laurens Voerman
+fix error in CmakeLists: CMAKE_CXX_COMPILER_VERSIO -> CMAKE_CXX_COMPILER_VERSION
+
+Tue, 20 Sep 2016 17:25:35 +0100
+Author : Robert Osfield
+Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph
+
+Tue, 20 Sep 2016 17:23:37 +0100
+Author : Robert Osfield
+Refactored texture sharing code so that it modifies the RefAttributePair directly thus honouring the override flags and fixing a bug of loosing these override flags when sharing
+
+Tue, 20 Sep 2016 17:01:26 +0100
+Author : Robert Osfield
+Cleaned up the spacing and const of various method parameters.Added non const versions of StateSet::getAttributePair() and getTextureAttributePair()
+
+
+Tue, 20 Sep 2016 14:40:28 +0100
+Author : OpenSceneGraph git repository
+Merge pull request #134 from LaurensVoerman/Submissions10Specialize -Wmaybe-uninitialized -Wextra and -Wno-misleading-indentation gcc warning flags to 4.6, 4.9 and 6.0 respectively
+
+Tue, 20 Sep 2016 10:23:15 +0200
+Author : Laurens Voerman
+short version with gcc warning flags depending on compiler version.
+
+Tue, 20 Sep 2016 10:20:47 +0200
+Author : Laurens Voerman
+Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph into Submissions10
+
+Mon, 19 Sep 2016 19:39:01 +0100
+Author : OpenSceneGraph git repository
+Merge pull request #136 from LaurensVoerman/Submissions11disable warning C4589 for MSVC
+
+Mon, 19 Sep 2016 16:40:59 +0200
+Author : Laurens Voerman
+disable warning C4589 for MSVC
+
+Fri, 16 Sep 2016 17:12:41 +0200
+Author : Laurens Voerman
+enable some more aggressive warning flags for gcc 4.7 and cmake version below 3
+
+Thu, 15 Sep 2016 07:53:10 +0100
+Author : OpenSceneGraph git repository
+Merge pull request #130 from LaurensVoerman/Submissions7VS2015 dae plugin fix a few declaration of 'X' hides previous
+
+Thu, 15 Sep 2016 07:50:51 +0100
+Author : OpenSceneGraph git repository
+Merge pull request #131 from filnet/masterStandardManipulator: use proper bit mask when clearing a relative flag
+
+Wed, 14 Sep 2016 14:32:35 +0200
+Author : Philippe Renon
+StandardManipulator: use proper bit mask when clearing a relative flag
+
+Tue, 13 Sep 2016 17:07:28 +0200
+Author : Laurens Voerman
+VS2015 fix a few warning C4456: declaration of 'X' hides previous local declaration
+
+Mon, 12 Sep 2016 16:22:54 +0100
+Author : OpenSceneGraph git repository
+Merge pull request #128 from LaurensVoerman/Submissions5wrong Meta_Shape tag in ConvexHull
+
+Mon, 12 Sep 2016 16:22:18 +0100
+Author : OpenSceneGraph git repository
+Merge pull request #127 from LaurensVoerman/Submissions4remove last Performer reference
+
+Mon, 12 Sep 2016 16:49:35 +0200
+Author : Laurens Voerman
+wrong Meta_Shape tag in ConvexHull
+
+Fri, 9 Sep 2016 10:58:19 +0200
+Author : Laurens Voerman
+remove last Performer reference
+
+Tue, 6 Sep 2016 09:31:16 +0100
+Author : Robert Osfield
+Updated version number to 3.5.5
+
+Mon, 5 Sep 2016 19:12:54 +0100
+Author : Robert Osfield
+Updated ChangeLog formatting
+
 Mon, 5 Sep 2016 17:57:27 +0100
 Author : Robert Osfield
 Updated ChangeLog, AUTHORS and README for 3.5.4 dev release
diff --git a/applications/osgversion/Contributors.cpp b/applications/osgversion/Contributors.cpp
index 74f6f1072..5adf4e5ae 100644
--- a/applications/osgversion/Contributors.cpp
+++ b/applications/osgversion/Contributors.cpp
@@ -261,7 +261,9 @@ const char* invalidNames[] =
     "RayIntersector",
     "OpenSceneGraph-Data",
     "Node",
-    "AlphaFunc"
+    "AlphaFunc",
+    "CompositeViewer",
+    "OpenSceneGraph-3"
 };
 
 
@@ -498,6 +500,14 @@ struct NameCorrection
 
 NameCorrection nameCorrections[] =
 {
+    {"LaurensVoerman","Meta_Shape",
+     "Laurens", "Voerman"},
+    {"LaurensVoerman","Fri",
+     "Laurens", "Voerman"},
+    {"LaurensVoerman","",
+     "Laurens", "Voerman"},
+    {"Laurens","Loerman",
+     "Laurens", "Voerman"},
     {"FrancoisTigeot","",
      "Francois", "Tigeot"},
     {"Juan","Manuel",