Stop extending <ol> as it (somehow?) breaks under Canary
Merge branch 'master' into gh-pages