Merge master to beta for bug fixing around @RobertFewins-Kalb's updates

Scratch that last comment I made, there were no significant differences (just some pieces Krabappel-related).