Merge pull request #5008 from wintersandroid/master