Duplicate changes to master

Duplicate rapid fire changes to `develop` in `master`. Most new fixes and additions should arrive as pull requests.