Small javadoc rewording.
Merge branch 'master' into feature/OptionOrder