Merge branch 'jdo' into jdo-SNAPSHOT