[hibernate-dev] merge master onto metamodel regularly