Fix: User.channels returns an empty array
Merge branch 'maint'