Merge pull request #1 from facebook/master

Facebook iOS SDK 3.11