Issues/455

This implements https://github.com/globaleaks/GlobaLeaks/issues/455