Recover the highlighting in VS 2010.
Merge remote-tracking branch 'origin/hardcase_work' into hardcase_work