Travis should only try master branch
Merge remote-tracking branch 'origin/master' into Issue_26