Resolve conflicts

git-svn-id: https://plugins.svn.wordpress.org/feed-pull/trunk@906057 b8457f37-d9ea-0310-8a92-e5e31aec5664