Fix typo in Javadoc

Fixes gh-938
Remove trailing whitespace
Merge branch '1.0.x'