Oh, wow, didn't pull upstream before starting.  Facepalm.  Alright, let me merge it in and clean things up.