* Fix a bug in type externalization.
xMerge remote-tracking branch 'upstream/master'
test update