Merged pidgin/main into default