Commit 308aa802ff for wordpress.org