Merge changes I1c8b2990,Iba947381

* changes:
  C-ify DataSource
  C API for extractor plugins