Merge 'master' back into 'develop'

I landed a great pull by @usmonster in `master` instead of `develop`.

We should try and adhere to GitFlow where possible.