Changes to the types.
Merge branch 'master' of github.com:dmerckx/cpl