Upgrade settings as in Mezzanine (merged)

I merged the changes made in Mezzanine to Cartridge.