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

Conflicts:
	NEWS