remove unneeded warning
Merge branch 'master' into mimetypes_ios