Rewrote the regex and mail hook to fix incorrect processing of utm_override
Version bumped from 7.x-1.0-rc5 to 7.x-1.0-rc6
Merge branch 'release-7.x-1.0-rc6'