whups, have to implement this elsewhere, too :)
Merge branch '1.12'