post-release version bunmp
Merge branch 'master' into jdk6backport(android)