File update for 1.2.4

git-svn-id: https://plugins.svn.wordpress.org/unconfirmed/trunk@890778 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge branch '1.2.x' into svn

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