Merge pull request #3413 from pymumu/master