@dildick and @ianna - It looks like these are the exact same things that @bsunanda committed and were merged yesterday and not things that Sven added himself.  Maybe you had merged his commit and not rebased.  I'm working on the calotower PR right now.  Then I'll try the merge and see if there are conflicts.