Merge "Fix a minor javadoc issue" into tm-qpr-dev