merged changeset 24732, 24734, 24743, 24751 and 24753 from core

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