[hibernate-commits] [hibernate/hibernate-orm] 2e09b1: Fixed bad merge of metamodel to master