Add config option to stop VanillaInThisDiscussion from getting out of hand
Merge pull request #1736 from Tama63/patch-1

Stop VanillaInThisDiscussion overrun by limiting to 20 with new config option & better sort