Merge pull request #5186 from leleobhz/master