Mainline config check
Merge branch 'master' of github.com:Papiel/provider-gmail