[lzop/el4/master: 21/21] Merge remote branch 'origin/master' into el4