Merge pull request #2508 from comex/fix-gecko-codes Fix bug where Gecko codes would be "enabled by default"