Merge pull request #1894 from hroncok/patch-1