Merge branch 'master' of github.com:landonf/libffi-ios