Fixed JavaDoc errors. JavaDoc was autogenerated on my machine with no
errors.
Merge remote-tracking branch 'origin/master'