Deal with different test listing formats.
Ignore .git dir when packaging zip file.
Merge branch 'master' into develop