Missed one
A number of improvements to CAPI compatibility

Separated out from some more involved changes that are
required to get the 'pwd' module working.
Merge branch 'master' into personal

Conflicts:
	Makefile