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

Update global config