remove net40 from travis build
Merge branch 'dev' into net40