Lots of merge issues, so tried to beef up the is_subclassable test as well.
Attach a file by drag & drop or click to upload
