Merge branch 'objc++' into maint