Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Conflicts:
backbone-fundamentals.epub
index.html