Merge pull request #1896 from meum/patch-1