Make sure git checkout master does not fail on other branches when running in travis.
Merge branch 'master' into mysql_ramdisk
Updating .travis.yml.