Merge branch 'tg/next/0.4_fixme_collegehumor' into next