diff --git a/AUTHORS.txt b/AUTHORS.txt
index fbec557e3..e1bc0d4fe 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,6 +1,6 @@
-OpenSceneGraph Library 3.3.6
+OpenSceneGraph Library 3.3.8
 
-543 Contributors:
+545 Contributors:
 
 Firstname Surname
 -----------------
@@ -54,12 +54,12 @@ Pavel Moloshtan
 Brad Christiansen
 Olaf Flebbe
 Mathieu Marache
+Lionel Lagarde
 Jason Daly
 Art Tevs
 Philip Lowman
 Per Fahlberg
 Norman Vine
-Lionel Lagarde
 Terry Welsh
 Serge Lages
 Romano José Magacho da Silva
@@ -114,6 +114,7 @@ Nico Kruithof
 Martin Aumueller
 Mario Valle
 Lukasz Izdebski
+Konstantin Matveyev
 Jorge Izquierdo Ciges
 Jordi Torres
 Gordon Tomlinson
@@ -152,9 +153,9 @@ Martins Innus
 Maciej Krol
 Lilin Xiong
 Leandro Motta Barros
-Konstantin Matveyev
 Johan Nouvel
 Javier Taibo
+Jannik Heller
 Hartwig Wiesmann
 Donn Mielcarek
 Corbin Holtz
@@ -376,6 +377,7 @@ Ragnar Hammarqvist
 Qing Shen
 Piotr Rak
 Pierre Bourdin
+Philippe Renon
 Philipp Svehla
 Philipp Siemoleit
 Philipp Mächler
@@ -463,7 +465,6 @@ Jeffrey Kinross
 Jay Zuckerman
 Jason Howlett
 Jason Ballenger
-Jannik Heller
 Jamie Robertson
 James Killian
 James Athey
@@ -476,6 +477,7 @@ Gunter Huber
 Gregory Jaegy
 Graeme Harkness
 Gian Lorenzetto
+Giampaolo Viganò
 George Papagiannakis
 Galen Faidley
 Frida Schlaug
diff --git a/ChangeLog b/ChangeLog
index 12a2ddd09..a60a5924c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,52 @@
+2015-04-20 09:39  robert
+
+	* src/osg/State.cpp: Moved uniform substitution to infront of
+	  vertex attribute substituion to make sure gl_Vertex usage is
+	  replaced when required.
+
+2015-04-20 09:08  robert
+
+	* include/osgUtil/MeshOptimizers: From Tim Moore, "The
+	  order_by_primitive_mode comparer was not providing a strict weak
+	  ordering, which was causing a crash in the sort() call in
+	  VertexAccessOrderVisitor::optimizeOrder (gcc 4.9, Fedora 21)."
+
+2015-04-17 14:36  robert
+
+	* CMakeLists.txt: Updated dev release number
+
+2015-04-17 13:33  robert
+
+	* include/osgManipulator/AntiSquish: Added implementations for the
+	  libraryName and className for the AntiSquish node.
+
+2015-04-17 13:24  robert
+
+	* src/osg/Node.cpp: Fixed CollectParentPaths visitor so that it
+	  sets the setNodeMaskOverride(0xffffffff) to make sure all parents
+	  are traversed to find parents, even ones that have their NodeMask
+	  set to 0x0.
+
+2015-04-17 13:22  robert
+
+	* examples/osgmanipulator/osgmanipulator.cpp: Added --test-NodeMask
+	  option to test crash when a parent of osgmanipulator::AntiSquish
+	  node has a NodeMask set to 0x0.
+
+2015-04-16 11:19  robert
+
+	* src/osgPlugins/osgjs/json_stream: Changed MSVC version test to <=
+	  to enable fallback for VS2010.
+
+2015-04-16 10:07  robert
+
+	* src/osgManipulator/AntiSquish.cpp: Fixed crash when AntiSquish
+	  node is the root of the scene graph.
+
+2015-04-15 18:34  robert
+
+	* ChangeLog: Updated ChangeLog
+
 2015-04-15 18:05  robert
 
 	* CMakeLists.txt: Updated version number of dev release
diff --git a/applications/osgversion/Contributors.cpp b/applications/osgversion/Contributors.cpp
index 66f885c41..4846d5c8f 100644
--- a/applications/osgversion/Contributors.cpp
+++ b/applications/osgversion/Contributors.cpp
@@ -353,6 +353,7 @@ TypoCorrection typoCorrections[] =
     {"Krulthof",       "Kruithof"},
     {"Lagrade",        "Lagarde"},
     {"Largade",        "Lagarde"},
+    {"Largarde",       "Lagarde"},
     {"Larshkari",      "Lashkari"},
     {"Lashakari",      "Lashkari"},
     {"Lashari",        "Lashkari"},
@@ -478,8 +479,9 @@ TypoCorrection typoCorrections[] =
     {"Gjøl","Gjøl"},
     {"RavÅ¡elj","Rav¨elj"},
     {"Ravsel",  "Rav¨elj"},
-    {"Ravselj", "Rav¨elj"}
-
+    {"Ravselj", "Rav¨elj"},
+    {"Janik", "Jannik"},
+    {"Viganò", "Viganò"}
 };