A bunch of work I did some time ago. Probably broken.
Merge remote-tracking branch 'origin/master'