Merge branch 'bug2324_uncompress' into maint-0.2.1