Tidy some Javadocs
Merge branch '1.1.x'