Merge pull request #1871 from felixonmars/patch-1