addressed issue https://github.com/globaleaks/GlobaLeaks/issues/829
addressed issue https://github.com/globaleaks/GlobaLeaks/issues/829
Merge branch 'fix_issue_829' of github.com:globaleaks/GLBackend into fix_issue_829

* 'fix_issue_829' of github.com:globaleaks/GLBackend:
  addressed issue https://github.com/globaleaks/GlobaLeaks/issues/829

Conflicts:
	globaleaks/utils/utility.py
Merge pull request #211 from globaleaks/fix_issue_829

addressed issue https://github.com/globaleaks/GlobaLeaks/issues/829