Merge pull request #5072 from elepete/master