Begin getting the documentation markup sorted so as to work with Java 8.
A few more changes to get the documentation working in Java 8.
Break the special markup so that Java 8 will accept the JavaDoc comment.
Merge branch 'master' into markup
Merge branch 'master' into markup