Hmmm. That is strange. I just reverted my merger thinking that I had broken trunk. But it is still broken. Did I do something wrong reverting changes from 628175?

Best regards,
Ferdinand Soethe