[dspam/el6/master] (4 commits) ...Merge remote-tracking branch 'origin/master' into el6