Rename _InstantiatedType.underlying_type to _underlying_type
Merge branch 'master' into mammoth