Fix iphonesimulator arch
Merge branch 'master' into travis-ci.macosx.branch