Merge pull request #2691 from sumpfralle/patch-1