Merge branch 'master' into polymorphic_extern_classes