merged changeset 24834 and 24808 from core

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