Merging cfpropertylist-fix to master

Fixes #389 (and others).