[gridsite/el6] (7 commits) ...Merge branch 'master' into el6