Integration to main.

Merging my Objective-C/C++ changes back into the mainline.