File merge for 1.2.6

git-svn-id: https://plugins.svn.wordpress.org/unconfirmed/trunk@953616 b8457f37-d9ea-0310-8a92-e5e31aec5664