Make sure we always have posts for related stories
Merge pull request #2 from borkweb/6310-make-sure-we-always-have-related

Make sure we always have posts for related stories - and sorta backport