Merge branch 'gh-pages' into 2013-10-10-html-advanced-14