Update global config
Merge pull request #53 from magento/master

Update global config