branch 'master' into release

release branch was a little borked, making the release branch the new
master

* master:
  release