Merge branch 'out_file_lzop' into HEAD