Merge changes in master ammo.idl