Merge pull request #4626 from Voyager1/fix-trac15163