Merge branch 'master' of github.com:/libffi/libffi