Develop > Master for 0.6 release

cc: @dchambers, @andyberry88, @leggetter, @james-shaw-turner