Merge pull request #3551 from kugel-/scintilla