fixed javadoc failure
Merge origin/master