Merge in AFNetworking updates