addresses issue https://github.com/globaleaks/GlobaLeaks/issues/303
Merge remote-tracking branch 'origin/issue/303' into devel