Upgrade of Hibernate EntityManager to version 4.2.15.Final
Merge branch 'hibernate_update'