Travis-ci only checks master and develop branches
Merge branch 'hotfix/invalid_travis_ci_file'