description is going to take up two lines anyway, be a little more descriptive
Merge branch 'master' into gh-pages
Deploying to gh-pages