diff --git a/AUTHORS.txt b/AUTHORS.txt
deleted file mode 100644
index f01059b07..000000000
--- a/AUTHORS.txt
+++ /dev/null
@@ -1,574 +0,0 @@
-OpenSceneGraph Library 3.6.0
-
-568 Contributors:
-
-Firstname Surname
------------------
-Robert Osfield
-Don Burns
-Stephan Huber
-Paul Martz
-Laurens Voerman
-Farshid Lashkari
-Mathias Fröhlich
-Marco Jez
-Wang Rui
-Jean-Sébastien Guay
-Ulrich Hertlein
-Mike Weiblen
-Sukender
-Eric Wing
-Cedric Pinson
-Brede Johansen
-Bob Kuehne
-Wojciech Lewandowski
-Michael Platings
-Geoff Michel
-Eric Sokolowsky
-David Callu
-Colin McDonald
-Trajce Nikolov
-Tim Moore
-Martin Lavery
-Mattias Helsing
-Jannik Heller
-Jason Beverage
-Tree
-Pjotr Svetachov
-Luigi Calori
-Alberto Luaces
-Mike Wittman
-Jan Peciva
-Chris Hanson
-Roland Smeenk
-Roger James
-Jeremy Moles
-J.P. Delport
-Andy Skinner
-Magnus Kessler
-David Fries
-Tom Jolley
-Paul Melis
-Jordi Torres
-Luc Frauciel
-Aurelien Albert
-Torben Dannhauer
-Pavel Moloshtan
-Brad Christiansen
-Terry Welsh
-Olaf Flebbe
-Mathieu Marache
-Lionel Lagarde
-Jason Daly
-Art Tevs
-Philip Lowman
-Per Fahlberg
-Norman Vine
-Chris Denham
-Sherman Wilcox
-Serge Lages
-Romano José Magacho da Silva
-Mourad Boufarguine
-Alberto Farre
-Glenn Waldron
-André Garneau
-Adrian Egli
-Sebastian Messerschmidt
-Randall Hopper
-Kristofer Tingdahl
-Jan Ciger
-Ruben Lopez
-Robert Michael
-Gideon May
-Don Tidrow
-Stephane Lamoliatte
-Michael Gronager
-Martin Naylor
-Joakim Simonsson
-David Spilling
-Daniel Sjölie
-Bryan Thrall
-Andreas Ekstrand
-Rafa Gaitan
-Mike Connell
-Konstantin Matveyev
-Fabien Lavignotte
-Thomas Hogarth
-Riccardo Corsi
-Melchior Franz
-Johannes Baeuerle
-Ravi Mathur
-Neil Hughes
-Martin Beckett
-Marc Helbling
-Joran Jessurun
-Gino van den Bergen
-David Guthrie
-Csaba Halasz
-Cory Riddell
-Chuck Seberino
-Boris Bralo
-Yefei He
-Sondra Iverson
-Simon Julier
-Rune Schmidt Jensen
-Ralf Habacker
-Rainer Oder
-Nico Kruithof
-Martin Aumueller
-Mario Valle
-Lukasz Izdebski
-Jorge Izquierdo Ciges
-Gordon Tomlinson
-Frederic Marmond
-Frederic Bouvier
-Carlo Camporesi
-Björn Blissing
-Alexander Sinditskiy
-Vladimir Chebaev
-Thibault Genessay
-Sasa Bistrovic
-Raymond de Vries
-Neil Groves
-Mikhail Izmestev
-Markus Trenkwalder
-Loic Dachary
-Joseph Steel
-John Shue
-Hartwig Wiesmann
-Brad Colbert
-Ben Discoe
-Vivek Rajan
-Uwe Woessner
-Tony Horrobin
-Thom DeCarlo
-Tatsuhiro Nishioka
-Tanguy Fautré
-Sean Spicer
-Ryan Kawicki
-Richard Schmidt
-Peter Hrenka
-Paul de Repentigny
-Nikolaus Hanekamp
-Neil Salter
-Mihai Radu
-Michael Hartman
-Martins Innus
-Maciej Krol
-Lilin Xiong
-Leandro Motta Barros
-Julien Valentin
-Johan Nouvel
-Javier Taibo
-Donn Mielcarek
-Corbin Holtz
-Blasius Czink
-Alexander Irion
-Wee See
-Toshiyuki Takahei
-Sebastien Grignard
-Rudolf Wiedemann
-Maria Ten
-Liang Aibin
-Katharina Plugge
-John Vidar Larring
-John Kelso
-John Ivar
-Gustav Haapalahti
-Erik den Dekker
-Emmanuel Roche
-Domenico Mangieri
-Daniel Larimer
-Colin Dunlop
-Bruce Clay
-Bradley Anderegg
-Andreas Goebel
-Alok Priyadarshi
-Ali Botorabi
-Alan Dickinson
-Vladimir Shabanov
-Tugkan Calapoglu
-Tim Daoust
-Sylvain Marie
-Sohey Yamamoto
-Sergey Leontyev
-Santosh Gaikwad
-Ryan Pavlik
-Robert Milharcic
-Rene Molenaar
-Piotr Domagalski
-Philippe Renon
-Phil Atkin
-Pawel Ksiezopolski
-Patrick Neary
-Nathan Monteleone
-Miha Rav¨elj
-Miguel Escriva
-Mattias Linde
-Mark Sciabica
-Marcin Prus
-Lee Butler
-Lars Nilsson
-Konstantin Sinitsyn
-Ken Sewell
-Julian Ortiz
-Julen Garcia
-John Kaniarz
-Johannes Scholz
-Jim Vaughan
-Jeremy Bell
-Jaromir Vitek
-James French
-Jaap Glas
-Guillaume Millet
-Gary Quinn
-Garrett Potts
-Gabor Dorka
-Fabio Mierlo
-Doug McCorkle
-Donald Cipperly
-Don Leich
-Dietmar Funck
-Colin Cochran
-Christian Ruzicka
-Christian Buchner
-Charles Cole
-Blake Williams
-Björn Hein
-Aurélien Chatelain
-Antoine Hue
-Andrew Bettison
-Andreas Henne
-Anders Backman
-Alexander Wiebel
-Alessandro Terenzi
-Alberto Barbati
-Zach Deedler
-Yuzhong Shen
-Warren Macchi
-Vincent Bourdier
-Terrex
-Tassilo Glander
-Steve Lunsford
-Stephane Simon
-Stephan Eilemann
-Stanislav Blinov
-Sergey Polischuk
-Roni Zanolli
-Ralf Kern
-Piotr Gwiazdowski
-Pierre Haritchabalet
-Perry Miller
-Paul Palumbo
-Paul Obermeier
-Nguyen Van Truong
-Nathan Cournia
-Morten Haukness
-Morné Pistorius
-Michael Mc Donnell
-Michael Henheffer
-Michael Guerrero
-Max Bandazian
-Mathias Fiedler
-Mathew May
-Martin von Gargern
-Martin Spott
-Martin Lambers
-Martijn Kragtwijk
-Marius Heise
-Marcin Hajder
-Marcel Pursche
-Lilith Bryant
-Kevin Moiule
-Keith Steffen
-Joseph Winston
-John Aughey
-Joachim Pouderoux
-Jean-Christophe Lombardo
-Jan Klimke
-James Turner
-James Moliere
-Igor Kravtchenko
-Himar Carmona
-He Sicong
-Guy Volckaert
-Gustavo Wagner
-Guillaume Taze
-Guillaume Chouvenc
-Giuseppe Donvito
-Gill Peacegood
-Giampaolo Viganò
-Gerrick Bivins
-George Tarantilis
-Ferdi Smit
-Eduardo Poyart
-Edgar Ellis
-Dmitry Marakasov
-Dimi Christopoulos
-Diane Delallée
-David Longest
-David Ergo
-Daniel Trstenjak
-Craig Bosma
-Claus Scheiblauer
-Christophe Loustaunau
-Christian Kehl
-Bradley Baker Searles
-Brad Anderegg
-Aric Aumann
-Anish Thomas
-Andrew Sampson
-Andrew Lorino
-Alexandre Amalric
-Aitor Moreno
-Zbigniew Sroczynski
-Yuri Vilmanis
-Xin Li
-Wang Lam
-Wand Rui
-Walter J. Altice
-Volker Walkiewicz
-Vladimir Vukicevic
-Vlad Danciu
-Vivien Delage
-Vincent Vivanloc
-Vincent Gadoury
-Vasily Radostev
-Valery Bickov
-Valeriy Dubov
-Vaclav Bilek
-Tyge Løvset
-Troy Yee
-Torben Dannahauer
-Tony Vasile
-Tomas Hogarth
-Tomas Hnilica
-Todd Furlong
-Tobias Ottenweller
-Tino Schwarze
-Tim George
-Thorsten Brehm
-Thomas Weidner
-Tan Dunning
-Tamer Fahmy
-Stewart Andreason
-Steven Thomas
-Stephan Wenglorz
-Simon Hammett
-Simon Carmody
-Simon Buckley
-Sid Byce
-Shuxing Xiao
-Shane Arnott
-Sergey Kurdakov
-Sebastien Kuntz
-Sandro Mani
-Ruth Lang
-Ruben The
-Ruben Smelik
-Ross Anderson
-Ronny Krueger
-Ronald van Maarseveen
-Romain Ouabdelkader
-Romain Charbit
-Rocco Martino
-Robert Swain
-Rob Smith
-Rob Radtke
-Rob Bloemkool
-Rick Pingry
-Rick Appleton
-Remo Eichenberger
-Reinhard Sainitzer
-Rein Kadijk
-Ragnar Hammarqvist
-Qing Shen
-Piotr Rak
-Pierre Bourdin
-Philipp Svehla
-Philipp Siemoleit
-Philipp Mächler
-Philip Lamb
-Petr Salinger
-Peter Bear
-Peter Amstutz
-Per Nordqvist
-Paul Idstein
-Paul Fredrikson
-Paul Fotheringham
-Paul Cheyrou-Lagreze
-Pau Garcia
-Patrick Hartling
-Parag Chaudhur
-Panagiotis Papadakos
-Panagiotis Koutsourakis
-Orhun Birsoy
-Oren Fromberg
-Oliver Neumann
-Ole-Morten Duesund
-Ognjen Kostic
-Nicolas Brodu
-Nick Thu
-Nick Black
-Mojtaba Fathi
-Mirko Viviani
-Mikkel Gjøl
-Mike Krus
-Mike Garrity
-Mick Thu
-Michal Durkovic
-Michael Schanne
-Michael Polak
-Michael Morrison
-Michael Logan
-Michael Kapelko
-Michael Bach Jensen
-Maya Thu
-Maya Leonard
-Max Rhiener
-Max Behensky
-Mauricio Hofmam
-Matthew May
-Matthew Johnson-Roberson
-Matt Green
-Matt Burke
-Mathias Walker
-Mathias Goldau
-Mason Menninger
-Martin Scheffler
-Martin Innus
-Martin Beck
-Marius Kintel
-Mario Guimaraes
-Marcus Hein
-Marco Thu
-Marco Sciabica
-Marco Lehmann
-Lukas Diduch
-Louis Hamilton
-Likasz Izebski
-Lewis Harmon
-Leigh Stivers
-Laurence Muller
-Laura Cerritelli
-Kyle Centers
-Kristopher Bixler
-Kim Seokhwan
-Kim Bale
-Karsten Weiss
-Karl Heijdenberg
-Jutta Sauer
-Julian Scheid
-Juergen Rensen
-Juan Manuel Alvarez
-Juan Hernando
-Josh Portway
-Jonathan Greig
-John Tan
-John Hedström
-John Grant
-John Farrier
-John Donovan
-John Davis
-John Cummings
-John Argentieri
-Joe Thompson
-Joan Abadie
-Jim Brooks
-Jeroen den Dekker
-Jeffrey Kinross
-Jay Zuckerman
-Jason Howlett
-Jason Ballenger
-Jamie Robertson
-James Killian
-James Athey
-J.E. Hoffmann
-Holger Helmich
-Henrique Bucher
-Hautio Jari
-Hartmut Seichter
-Gunter Huber
-Gregory Jaegy
-Graeme Harkness
-Gian Lorenzetto
-George Papagiannakis
-Geoff Thu
-Galen Faidley
-Frida Schlaug
-Frederic Smith
-Frederic Morin
-Frank Warmerdam
-Frank Midgley
-Frank Lindeman
-Frank Lichtenheld
-Francois Tigeot
-Filip Arlet
-Ferdinand Cornelissen
-Fajran Iman
-Fabien Dachicourt
-Erik Johnson
-Eric Thu
-Eric Buehler
-Eduardo Alberto
-Edmond Gheury
-Ed Ralston
-Duvan Cope
-Duncan Cavens
-Drew Whitehouse
-Douglas A. Pouk
-Dmitriy Ogalcev
-Dean Iverson
-David Jung
-Danny Valente
-Daniel Stien
-Dan Minor
-César L. B. Silveira
-Cyril Brulebois
-Curtis Rubel
-Cory Slep
-Clément B½sch
-Clay Fowler
-Claus Steuer
-Chuck Sembroski
-Christopher Blaesius
-Christopher Baker
-Christophe Herreman
-Christian Noon
-Christian Kaser
-Christian Ehrlicher
-Chris McGlone
-Chris Djali
-Carlos Garcea
-Bryce Eldridge
-Bruno Herbelin
-Brian Keener
-Brede Thu
-Brandon Hamm
-Bill Prendergast
-Bernardt Duvenhage
-Benoit Laniel
-Benjamin Wasty
-Ben van Basten
-Bart Gallet
-Axel Volley
-Arjun Ramamurthy
-Anthousis Andreadis
-Anna Sokol
-Andy Preece
-Andrew Reyonolds
-Andreas Roth
-Andreas Jochens
-Andre Normann
-Alois Wismer
-Almalric Alexandre
-Allen Bierbaum
-Alexey Pavlov
-Alberto Jaspe
-Alan Purvis
-Alan Ott
-Alan Harris
-Adrien Grandemange
-Adrian Clark
-Adam Richard
-Abhishek Bansal
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0ff5754c..b53b68068 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(OPENSCENEGRAPH_SOVERSION 157)
 
 # set to 0 when not a release candidate, non zero means that any generated
 # git tags will be treated as release candidates of given number
-SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 2)
+SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 3)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
diff --git a/ChangeLog b/ChangeLog
index e1c547fe3..2294c47fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+Sat, 5 May 2018 15:47:28 +0100
+Author : Robert Osfield
+Restructed the handling of SCREEN_COORD scaling to better handle window resizing
+
+Sat, 5 May 2018 12:31:00 +0100
+Author : Robert Osfield
+Added C++ specific path for calling std::map<>::erase() to avoid issues with std::map<>::erase implementation that invalidates iterators
+
+Sat, 5 May 2018 12:28:45 +0100
+Author : Robert Osfield
+Replaced std::auto_ptr<> usage as it's deprecated in C++11 and will be removed in C++17
+
+Fri, 4 May 2018 16:11:31 +0100
+Author : OpenSceneGraph git repository
+Merge pull request #545 from emminizer/fix-gl3-text-bad-modeText only applies GL_TEXTURE_2D modes when fixed function is availabl…
+
+Fri, 4 May 2018 06:44:13 -0400
+Author : Daniel Emminizer
+Text only applies GL_TEXTURE_2D modes when fixed function is available.  Prevents GL3 Core Profile console spam.
+
+Fri, 4 May 2018 10:54:02 +0100
+Author : Robert Osfield
+Added non const version of State::getActiveDisplaySettings()
+
+Fri, 4 May 2018 09:44:43 +0100
+Author : Robert Osfield
+Added check for null to prevent null entries getting into the cache
+
+Fri, 18 Nov 2016 14:56:05 +0000
+Author : Robert Osfield
+Added osg::MakeString class to make it easier to create std::string's using std::ostream style << usage.
+
+Fri, 4 May 2018 09:22:54 +0100
+Author : Robert Osfield
+Fixed null pointer warning
+
+Thu, 3 May 2018 12:56:08 +0200
+Author : Björn Blissing
+Check existence of path before reading imageWhen loading texture images inside the FBX plugin check that the path
+exists before trying to read the image. This is done to avoid
+unnecessary warnings inside the readRefImageFile function.
+
+
+Wed, 2 May 2018 09:14:04 +0100
+Author : Robert Osfield
+Updated ChangeLog
+
 Wed, 2 May 2018 09:10:54 +0100
 Author : Robert Osfield
 Updates for the 3.6.1-rc2
diff --git a/README.md b/README.md
index 7d253826e..a476fe2ad 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ If details below are not sufficient then head over to the openscenegraph.org to
 
 Robert Osfield.
 Project Lead.
-2nd May 2018.
+6th May 2018.
 
 ---