User content branch for Travis CI badge.
Merge branch 'master' into content