Merge pull request #1875 from spaetow/patch-2