[hibernate-dev] Back-porting to 3.6