Merge branch 'master' of github.com:gigya/wordpress

git-svn-id: https://plugins.svn.wordpress.org/gigya-socialize-for-wordpress/trunk@1020091 b8457f37-d9ea-0310-8a92-e5e31aec5664