Merge branch 'master' into java6