JavaDoc changes to permit build with JDK 8
Merge pull request #787 from widdowquinn/master

Javadoc changes to get builds past JDK 8