Fixing typo.
Merge branch 'highlight' into testing