Master merge

Time to move this stuff to master.