Attempted to remove < and > in javadoc to make the JDK 8 compiler happy
Merge branch 'master' into jdk7