Travis should only worry about the master branch
Merge branch 'master' into refactor/server-core