Added blockquote border from PR #1402
Added changes from PR #1401
Merged changes from PR #1340