Props chetan200891, ianbelanger, afercia. Fixes #43803. Built from https://develop.svn.wordpress.org/trunk@43174 git-svn-id: http://core.svn.wordpress.org/trunk@43003 1a063a9b-81f0-0310-95a4-ce76da25c4cd