Fireplace update rollup
Merge pull request #10 from mozilla/update_rollup

Fireplace update rollup