updating 1.2 from trunk


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