pidgin/pidgin

pidgin/pidgin/
Merge the last pr from the public tree
release-2.x.y
2016-06-18, Gary Kramlich
d5f8a3399782