1.7 commit

git-svn-id: https://plugins.svn.wordpress.org/wp-construction-mode/trunk@885038 b8457f37-d9ea-0310-8a92-e5e31aec5664