Issue/513

Ready to be merged, as detailed in the issue: https://github.com/globaleaks/GlobaLeaks/issues/513