Merge pull request #1944 from rwalli/patch-1