updat trunk

git-svn-id: https://plugins.svn.wordpress.org/email-pick-up/trunk@818083 b8457f37-d9ea-0310-8a92-e5e31aec5664