Eh, might as well squash this stuff in master