Merge commit 'c3fd52ed00409e99fdcb6ac28754e79613410470' * commit 'c3fd52ed00409e99fdcb6ac28754e79613410470': Minor JavaDoc additions and some long line fixes.
Merge commit 'c3fd52ed00409e99fdcb6ac28754e79613410470' * commit 'c3fd52ed00409e99fdcb6ac28754e79613410470': Minor JavaDoc additions and some long line fixes.