This improved compatibility with Hibernate ORM 5.0, 5.1 and 5.2.
(Not nearly enough yet)