updates for train 24
Merge pull request #27 from mozilla/merge-train-24

updates for train 24