Merged in small change from ror31 branch: set_inheritance_column is about to be deprecated in favor of self.inheritance_column=