squashed rebuild discussion show
Merge branch 'master' into rebuild-discussion-show
Merge pull request #1316 from loomio/rebuild-discussion-show

Rebuild discussion show