Merge branch 'no-data-uri' into gh-pages

Conflicts:
README.md
index.html