[hibernate-commits] [hibernate/hibernate-core] 346418: Final sync with upstream master