Aliased ffi types.
Fix commit 0ca928024.
Merge branch 'fix-master-save'