JUnit and JARs.
Merge origin/master