I've created a new pull request incorporating Martin Ball's commit with some small improvements: https://github.com/hibernate/hibernate-orm/pull/998

I'm not sure of the appropriate way to instrument classes in hibernate-entitymanager. I need to check on that before pushing this fix.