Fix for bug 2398
Merge branch 'master' of https://github.com/inverse-inc/sogo