Remove deprecated method call (after JUNIT upgrade)
Merge remote-tracking branch 'origin/master'