Fix chat settings menu scroll bar in Firefox
Merge remote-tracking branch 'origin/master' into gh-pages