Merge branch 'jpa' into jpa-SNAPSHOT