Testing on Java 6, 7 and 8. Mostly Javadoc changes. :P
Merge remote-tracking branch 'origin/master'