Merge origin/Hibernate_with_tests