fixed issue https://github.com/globaleaks/GlobaLeaks/issues/396
Merge branch 'issue/396', remote-tracking branch 'origin'