[lzop/el5/master] (10 commits) ...Merge remote branch 'origin/master' into el5