Fix infinite loop in ClassName.fromClass()
Merge branch 'DarickTong-patch-1'