Update to handlebars master