Resolve conflicts between CB and Kunena backend (#1576)
Merge pull request #1587 from mahagr/master

Resolve conflicts between CB and Kunena backend (#1576)