version release
Merge branch 'master' into java-6