PR for the stuff Moghedrin pushed directly to our fork's master

Naughty @Moghedrin