Switched position of classes in isAssignableFrom()
Merge remote-tracking branch 'upstream/master'