Revert "Fix build program using new zip. Thanks Roberto Segura."

This reverts commit f950d2cacbb8e831446bb45c1ba22091c4efeeb2.
Prepare for 2.5.14 development
Merge remote-tracking branch 'upstream/2.5.x' into 2.5.x-defrules