pidgin/pidgin

pidgin/pidgin/
Merge to default to fix conflicts

2016-10-24, Mike Ruprecht
6dc8cae57962