git-svn-id: https://develop.svn.wordpress.org/trunk@22119 602fd350-edb4-49c9-b593-d223f7449a82
Props DH-Shredder, kurtpayne, markoheijnen see #6821 git-svn-id: https://develop.svn.wordpress.org/trunk@22094 602fd350-edb4-49c9-b593-d223f7449a82