Check for gzipped in a more intelligent way
Merge branch 'master' into gb_master