index: troubleshooting line breaks
Merge branch 'master' into gh-pages