Silly bug that prevented admin_channels from working on first load...
Merge remote-tracking branch 'parent/master'