fixing this shit back
Merge branch 'v3-channels' of https://github.com/play/play into v3-channels