Backs in changes from #c49ba3c
http://cgit.drupalcode.org/handlebars/commit/?id=c49ba3c