merged changeset 24790 from core

git-svn-id: https://plugins.svn.wordpress.org/mp6/trunk@745590 b8457f37-d9ea-0310-8a92-e5e31aec5664