r17661: A patch from Martin Kuehl: