Merge branch 'travis-config' into travis/master-new