Merge pull request #1767 from SvenRoederer/patch-2