Tested with 4.1

git-svn-id: https://plugins.svn.wordpress.org/wpml-short-code-translator/trunk@1050351 b8457f37-d9ea-0310-8a92-e5e31aec5664
WordPress 4.1.0 Tested

git-svn-id: https://plugins.svn.wordpress.org/wpml-short-code-translator/trunk@1050352 b8457f37-d9ea-0310-8a92-e5e31aec5664