diff --git a/AUTHORS.txt b/AUTHORS.txt
index 18b3b1a24..89e686928 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -29,10 +29,10 @@ Trajce Nikolov
 Colin McDonald
 Tim Moore
 Martin Lavery
+Laurens Voerman
 Tree 
 Luigi Calori
 Mike Wittman
-Laurens Voerman
 Chris Hanson
 Roland Smeenk
 Roger James
@@ -73,6 +73,7 @@ Jan Ciger
 Glenn Waldron
 Gideon May
 Don Tidrow
+Aurelien Albert
 Stephane Lamoliatte
 Romano José Magacho da Silva
 Michael Gronager
@@ -81,7 +82,6 @@ Joakim Simonsson
 David Spilling
 Daniel Sjölie
 Bryan Thrall
-Aurelien Albert
 Torben Dannhauer
 Fabien Lavignotte
 Mike Connell
@@ -119,6 +119,7 @@ Thibault Genessay
 Sasa Bistrovic
 Ravi Mathur
 Ralf Habacker
+Pjotr Svetachov
 Neil Groves
 Markus Trenkwalder
 Loic Dachary
@@ -156,7 +157,6 @@ Sebastien Grignard
 Ryan Kawicki
 Rudolf Wiedemann
 Romano Magacho
-Pjotr Svetachov
 Mikhail Izmestev
 Maria Ten
 Liang Aibin
diff --git a/ChangeLog b/ChangeLog
index 916cc3ee0..5ab1759b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,114 @@
+2013-07-02 14:35  robert
+
+	* CMakeLists.txt: From Laurens Voerman, "With fstream inheritaince
+	  now removed the warning can be enabled again."
+
+2013-07-02 14:17  robert
+
+	* src/osgPlugins/ive/Geometry.cpp: From Laurens Voerman, "some of
+	  my ive files now generate a warning:
+	  Warning, can't assign attribute binding as no has been array
+	  assigned to set binding for.
+	  
+	  I think those are ive's with bumpmaps, but I have not checked
+	  yet. The problem is in
+	  OpenSceneGraph\src\osgPlugins\ive\Geometry.cpp
+	  where the code tries to set Normalize and Binding for a missing
+	  Array.
+	  I think that code can safely be skipped, considering the write
+	  function has a hardcoded write when the array is missing.
+	  (introduced in svn rev 13488)
+	  
+	  modified file (OpenSceneGraph\src\osgPlugins\ive\Geometry.cpp)
+	  attached in Zip"
+
+2013-07-02 14:02  robert
+
+	* src/osgPlugins/osg/BinaryStreamOperator.h: From Laurens Voerman,
+	  "Recent changes cause a few warnings in MSVC 2012
+	  svn 13587 From David Callu, warning fixes and removal of spaces
+	  at end of lines.
+	  
+	  this can be fixed by adding a space before the comment opening
+	  /*.
+	  full modified file
+	  (openscenegraph\src\osgplugins\osg\BinaryStreamOperator.h)
+	  attached in zip
+	  
+	  Regards, Laurens.
+	  
+	  
+	  openscenegraph\src\osgplugins\osg\BinaryStreamOperator.h(71):
+	  warning C4138: '*/' found outside of comment
+	  (OpenSceneGraph\src\osgPlugins\osg\ReaderWriterOSG2.cpp)
+	  openscenegraph\src\osgplugins\osg\BinaryStreamOperator.h(73):
+	  warning C4138: '*/' found outside of comment
+	  (OpenSceneGraph\src\osgPlugins\osg\ReaderWriterOSG2.cpp)
+	  openscenegraph\src\osgplugins\osg\BinaryStreamOperator.h(211):
+	  warning C4138: '*/' found outside of comment
+	  (OpenSceneGraph\src\osgPlugins\osg\ReaderWriterOSG2.cpp)
+	  openscenegraph\src\osgplugins\osg\BinaryStreamOperator.h(213):
+	  warning C4138: '*/' found outside of comment
+	  (OpenSceneGraph\src\osgPlugins\osg\ReaderWriterOSG2.cpp)"
+
+2013-07-02 13:45  robert
+
+	* src/osg/State.cpp: Restructed handling of the
+	  _currentShaderCompositionUniformList in State::apply() and
+	  State::apply(const StateSet*) so that it can be used even when
+	  shader composition isn't enabled.
+
+2013-07-02 10:32  robert
+
+	* include/osg/Program, src/osg/Program.cpp: From Aurelien Albert,
+	  "Recently I had to integrate a client OpenGL library with OSG.
+	  For textures and other StateAttribute I've done that by
+	  subclassing osg::StateAttribute and this works well.
+	  
+	  But for glPrograms, in order to get all osg's uniform management
+	  system to work, I had to subclass
+	  osg::program::PerContextProgram.
+	  
+	  Here is a modified version of this class, which add some
+	  "virtual" method to allow easy subclassing."
+
+2013-07-02 09:44  robert
+
+	* include/osg/Array: From Pjotr Svetachov, "The binding of arrays
+	  is always set to BIND_UNDEFINED when using the array constructor
+	  because the binding parameter is ignored. Here is a fix."
+
+2013-07-02 09:27  robert
+
+	* include/osgUtil/SceneView, src/osgUtil/SceneView.cpp: Added
+	  SceneView::Options enum enetries APPLY_GLOBAL_DEFAULTS and
+	  CLEAR_GLOBAL_STATESET to control whether a
+	  _globalStateSet->clear() and _globalStateSet->setGlobalDefaults()
+	  should be called.
+	  
+	  osgViewer::Renderer doesn't use these enum settings so now no
+	  longer has a calls StateSet::clear() or
+	  StateSet::setGlobalDefaults() on the osg::Camera's StateSet.
+	  Previously these were being
+	  called and breaking the ability to attached state to Camera's
+	  StateSet.
+
+2013-07-01 16:15  robert
+
+	* src/osg/Array.cpp: From Pjotr Svetachov, "In a submission on June
+	  27th a lot of new array types were added. This modified the
+	  osg::Array::Type enum. Because of this s_ArrayNames array in
+	  Array.cpp is now not in sync. This can lead to corrupt exports or
+	  crashes when writing .osg files because the change added new
+	  types in the middle of the enum instead of at the end.
+	  
+	  Attached is a new Array.cpp to reflect the new array types."
+
+2013-07-01 12:16  robert
+
+	* AUTHORS.txt, ChangeLog, applications/osgversion/Contributors.cpp:
+	  Updated AUTHORS, ChangeLog for dev release
+
 2013-07-01 10:22  robert
 
 	* include/osg/Array: Removed BIND_INSTANCE_DIVISOR as they don't