Updating to the current state of master...

Technically a merge, but I have my merge settings weird on this computer.