Automatic code formatting pass (touches a lot, but safely)
Merge Master into benplaying