Add a little padding to error entries
Merge branch 'master' into gh-pages