Merge branch 'develop'

* develop:
  fix error in registration of handlebars helpers
Merge branch 'master' into develop

* master: