preventing admin highlight from overlapping when on multiple lines
Merge pull request #1862 from awesomerobot/master

preventing staff highlight from overlapping when on multiple lines
Merge remote-tracking branch 'upstream/master'