travis fixes
Merge remote-tracking branch 'Auto/master' into AutoTrace-Micro-tech