Fixes #3207: correct the sorting of files in zip
Merge pull request #4 from fanf/bug_3207/dev/correct_sorting_of_file_in_zip

Fixes #3207: correct the sorting of files in zip
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

* branches/rudder/2.4:
  Fixes #3207: correct the sorting of files in zip
Merge branch 'branches/rudder/2.5'

* branches/rudder/2.5:
  Fixes #3207: correct the sorting of files in zip