I'm done with the merges I was working on. Brian is running some things through build / staging at the moment, though.
