Merge remote-tracking branch 'upstream/master' into bugfixFaqOwnQuestion
Changelog updated to 3.6.7