Merging changes from Git for version 1.7

git-svn-id: https://plugins.svn.wordpress.org/strong-testimonials/trunk@944360 b8457f37-d9ea-0310-8a92-e5e31aec5664