Merge branch 'jdo' into jpa