Merge travis file to QA branch