Forkmode never on surefire tests to aid in debugging
Merge remote-tracking branch 'origin/master'