Merge pull request #3898 from koying/fix3droidios