Merge "Use a less freqent dummy file name: zipdummy"