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

Update global config