Pull request: https://github.com/hibernate/hibernate-orm/pull/595 should do the trick.