fixing the travis config
Merge branch 'master' into ko_credit_card_test