Merge branch 'hibernate'