merge pull request

git-svn-id: https://plugins.svn.wordpress.org/wedgies-shortcode/trunk@1002869 b8457f37-d9ea-0310-8a92-e5e31aec5664
VIP Store Compatible

git-svn-id: https://plugins.svn.wordpress.org/wedgies-shortcode/trunk@1002873 b8457f37-d9ea-0310-8a92-e5e31aec5664