grim/pidgin

grim/pidgin/
Merged in strangeways/main/release-2.x.y (pull request #262)
release-2.x.y
2017-12-15, Gary Kramlich
5a2b60cf03da