first commit trying to address https://github.com/globaleaks/GlobaLeaks/issues/175