Ensure that block elements with replaced content don't get their block size overwritten.
Merge pull request #3105 from glennw/block-replaced-content

Ensure that block elements with replaced content don't get their block s...