Bug 916443 - WIP - Remote highlighter