Fixed error with symbol locator
Fixed mechanism to locate errors in the editor
Merge remote-tracking branch 'upstream/master'