Merge pull request #946 from techee/scintilla_quartz