Bring dev into master

Bad habit not to be bringing these into sync