[gridsite/el5] (10 commits) ...Merge branch 'master' into el5