Merge pull request #1039 from techee/highlight_fix2