allow travis build on other branches
Merge branch 'master' into issue-6