Uplift from mozilla/fireplace#409
Merge pull request #28 from muffinresearch/fireplace-pr409

Uplift from mozilla/fireplace#409