implemented feature request https://github.com/globaleaks/GlobaLeaks/issues/836
Merge commit '4b272db' into devel