[merge] patches from uwe