Merge pull request #3913 from omwok/master