remove incorrect javadoc
Merge remote-tracking branch 'ansell/master'