Git flow branches are checked by travis-ci again
Merge branch 'hotfix/invalid_travis_ci_file'