Merging changes from Git for version 2.2

git-svn-id: https://plugins.svn.wordpress.org/setmore-plus/trunk@982477 b8457f37-d9ea-0310-8a92-e5e31aec5664