Merge pull request #245 from rth7680/tromey-ffi-prep-cif-core-is-private

A rebase of #219