merge the current 'live' develop branch into master

ready to go, or any last minute additions?