I added some support for handlebars portability.
Oops.
Small adjustment.
Merge branch 'handlebars_packaging_1' into next