manual integration of old commit on splitted repos related to release 2.60.30
Merge branch 'devel' of github.com:globaleaks/GlobaLeaks into devel