Testing pushing one branch to another, dependant on test, not changing .travis.yml
Workspace changes
Blah
Merge branch 'trunk' into automated_testing
Fix git settings?