Fixed issue with unregistered highlighting
Merge branch 'master' into opera

* master:
  Fixed issue with unregistered highlighting