Merge pull request #1701 from SvenRoederer/patch-2