merge patch from Martin aus Chemnitz