Fix travis icon to reflect the "master" branch.
Merge branch 'master' into 13