#116. Upgrade to JUnit 4.11. Also a couple of JavaDoc fixes.
Merge remote-tracking branch 'origin/master'