was done twice in 40aef950 and 556d8b0b, but git merge
did not understood what we meant there ;-)