Intermediate trunk update

git-svn-id: https://plugins.svn.wordpress.org/ifs-simple-e-mail-management/trunk@766916 b8457f37-d9ea-0310-8a92-e5e31aec5664