2.1.7 update

git-svn-id: https://plugins.svn.wordpress.org/wp-clone-by-wp-academy/trunk@956853 b8457f37-d9ea-0310-8a92-e5e31aec5664