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

Update global config