Merge pull request #403 from mozilla/ExtensionSettings

patrick-canterino.de