Tested up to Version 4.1 of WordPress

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