Merge pull request #1774 from anandpdoshi/hotfix

Also save Global Defaults in System Settings patch