MDL-34388 Applied modified patch from externalzip plugin version 2012090500.