Fixed -c --compress-output option.
Merge branch 'develop' into contrib