Merge master to beta for testing

We're not really going to test this, this will be the release deployment, which I will make Monday after the long weekend.