Merge pull request #4845 from Memphiz/trac15261