Merge branch 'kiwitcms-update_description'