Merge pull request #2144 from dlech/patch-1