Merge pull request #4259 from pymumu/master