Merge all changes from Kunena 2.0.4