Merge master to savedgame

Was going to look at saving screenshots, but the branches diverged a bit, so I fixed that first.