Merge conflict
Merge branch 'develop' of https://github.com/NotPeax/Mozilla_Jam_Gems into develop