Merge pull request #3146 from pvdl/patch-1