Improved finding of current branch
More on travis
Merge branch 'master' into development