Bringing everything up-to date

git-svn-id: https://plugins.svn.wordpress.org/redirect-emails-on-staging/trunk@871476 b8457f37-d9ea-0310-8a92-e5e31aec5664