Fix width (cf lastcommit)
Merge branch 'master' into gh-pages