RP + Tim's night commits combined, and merge conflicts dealt with.