Merge develop into master

At some point, develop and master got out of sync - these are the last few commits from develop.