Javadoc changes to get it to compile with Java 8
Merge branch 'some_branch'