JavaDoc configuration
Merge branch 'master' into API10
Few JavaDoc comments
Merge branch 'master' into API10