Merge master into feature/24-ctcp-avatar-1