Removed JUnit from pre v3 versions
Merge branch 'v1' into v2