Let's try – a pull request https://github.com/hibernate/hibernate-orm/pull/581

However I certainly did it wrong (see my first comment in the pull request). To what branch I should target the pull requests to?