https://github.com/globaleaks/GlobaLeaks/issues/169
Merge branch 'master' of https://github.com/globaleaks/GlobaLeaks