Changed travis-ci accordingly
Merge branch 'master' into multivendor