Pull request: https://github.com/hibernate/hibernate-orm/pull/712
Brett Wooldridge (and everyone), can you please review thoroughly?