Make it even more explicit that extend/create operate on classes and return classes.
Merge remote-tracking branch 'upstream/master'