Merge branch 'master' into 'dev'

The dev branch is getting very out-of-date; I'm not sure of the purpose of this branch anymore, and it should probably be updated from master (via this PR), or deleted.