4.2 update

git-svn-id: https://plugins.svn.wordpress.org/wp-rss-aggregator/trunk@950176 b8457f37-d9ea-0310-8a92-e5e31aec5664