Better c-support.
Merge branch 'master' into HEAD