Props obenland for first patch and testing. Fixes #21443. git-svn-id: https://develop.svn.wordpress.org/trunk@21411 602fd350-edb4-49c9-b593-d223f7449a82
git-svn-id: https://develop.svn.wordpress.org/trunk@21343 602fd350-edb4-49c9-b593-d223f7449a82