Fix Ember/Handlebars
Merge pull request #1383 from jedmao/handlebars

Fix Ember/Handlebars