Need python wrapping fixes for include paths and a cherry-picked
commit from recent master.  Note we will need to address

1) Ensure public/private link interfaces are correct
2) new warning on reader