Patches from Jason Oster in bug #2010095.
Patches from Jason Oster in bug #2010095.

R1dO/scintilla_clone,R1dO/scintilla_clone,R1dO/scintilla_clone,R1dO/scintilla_clone,R1dO/scintilla_clone,R1dO/scintilla_clone,R1dO/scintilla_clone,R1dO/scintilla_clone