Remove leftover HEAD from merge
Merge pull request #3196 from bcrowe/2.5-fix-merge

Remove leftover HEAD from merge
Merge remote-tracking branch 'origin/2.5' into vip-rita7-2.5