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