Merge pull request #1995 from spaetow/patch-1