Merge [4114] into trunk



git-svn-id: http://ios.svn.wordpress.org/trunk@4116 7d847f7c-ffe1-4a24-85be-b788d016d96a