2.3 update for 3.9+

git-svn-id: https://plugins.svn.wordpress.org/my-shortcodes/trunk@949654 b8457f37-d9ea-0310-8a92-e5e31aec5664