Make sure we operate on the class name and not an object.
Merge remote-tracking branch 'upstream/master'