I've updated the code and the pull request. This could go as part of 4.3 if agreed by the Hibernate team