Fixing a Junit that caused a build error
Merge remote-tracking branch 'origin/master'