travis tests are not useful at all with this noise
Merge branch 'master' into imp_6_1