addressed issue https://github.com/globaleaks/GlobaLeaks/issues/904
Merge branch 'master' of github.com:globaleaks/GlobaLeaks