Merge branch 'tg/maint-0.4__fix_website/collegehumor.lua' into maint-0.4