Merge branch 'master' into traff/zip_helpers