Merge "Fix ReferenceTest#test_subclass."