Merge pull request #6012 from pymumu/master