Make zip archive entry look-up case-insensitive
Merge remote-tracking branch 'upstream/dev' into dev