Bring develop up to date with changes from master

Note: All these changes already exist on the master branch so they should be good to merge right away.