changing surefire to java.awt.headless to retain my sanity
Merge remote-tracking branch 'upstream/master'