Merge pull request #5983 from jomo/master