master reset from fc653d8 to bbf331c

[Marius Vollmer]

Hi,

fc653d8 was an accidental merge commit, and we don't like those around here.