Correct the messed up URLs.
Merge branch 'master' into jdk8