Update to 1.2.1

git-svn-id: https://plugins.svn.wordpress.org/download-attachments/trunk@1049083 b8457f37-d9ea-0310-8a92-e5e31aec5664