Merge branch 'master' into SVN trunk

git-svn-id: https://plugins.svn.wordpress.org/black-studio-tinymce-widget/trunk@1002735 b8457f37-d9ea-0310-8a92-e5e31aec5664