Junit fix for non-Windows platforms
Merge remote-tracking branch 'upstream/master'