Merge last stable sogo version (2.2.7) from inverse-inc/maint

Merge last stable sogo version (2.2.7) from inverse-inc/maint