grim/pidgin

grim/pidgin/
Merged in strangeways/main/trac-17174 (pull request #264)
release-2.x.y
2017-12-29, Gary Kramlich
894f2ac013de