Fix markdown
Merge branch 'master' into saucy