Yeah, sorry guys.  I rebased my old branch off master, and didn't correct the conflict properly.