New: OSQL
Merge pull request #10738 from ochococo/master

New: OSQL