patch from Trac
Merge branch 'post-formats/23198' into post-formats/23725
add patch from Trac
Merge branch 'post-formats/16047' into post-formats/23725