Commit in my branch with fix for 5.1 branch: https://github.com/jmartisk/hibernate-orm/commit/28ab06ae10bb84dc5e3b2a499f56eaff9a263f81
PR to master: https://github.com/hibernate/hibernate-orm/pull/1762

The commits for master and 5.1 are quite different. Gail, please could you take care of applying the 5.1 fix?