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...
add rpath back for library build

this broke library usage completely when it was removed
Merge pull request #3106 from zmike/librarian

add rpath back for library build