update recent changes in the master Extra166y sources.
Merge branch 'master' into jdk7