Discussions controller: merge master into stage.