Integrate cstubs.
Merge branch 'cstubs'