Added the ability for teasers to appear in the sidebar as explicitly related content or as part of a block.
Resolves merge conflicts.