Update develop with missing commits from master

Probable cause of this is that the release branch was only merged back into master at the last release.