[clac/el5/master] (4 commits) ...Merge remote branch 'origin/el5/master'