C

This pull request should take into account all of your upstream changes to date in the 'C' branch.  Only the build settings in the project needed to be modified to work with older iOS devices running 4.2 on armv6.