Fix Junit
Merge origin/master