Fixed forum button toggle
Merge branch 'master' into master3