Merged in dequisdequis/pidgin/release-2.x.y (pull request #176)
release-2.x.y
2017-02-23, Gary Kramlich