index: use way too many line breaks
Merge branch 'master' into gh-pages