Couple of markup fixes
Merge pull request #923 from jakearchibald/master

Couple of markup fixes