Fixed up a javadoc error
Merge remote-tracking branch 'origin/master'
Javadoc error!