principally integrate oumph patch, but also a bad rebase

I will know one day how to rebase correctly...