See #19978. git-svn-id: https://develop.svn.wordpress.org/trunk@19957 602fd350-edb4-49c9-b593-d223f7449a82
git-svn-id: https://develop.svn.wordpress.org/trunk@19842 602fd350-edb4-49c9-b593-d223f7449a82