Merge pull request #5971 from pymumu/master