Handlebars-runtime instead of normal
Merge branch 'master' into gh-pages