Experiment with changing a package.html to a package-info.java, as has been recommended since 2005. :)
Merge remote-tracking branch 'origin/master'