ifdeffed the CFAutorelease definition
Merges with origin/master