Merged in CMaiku/pidgin (pull request #201)

2017-06-15, Gary Kramlich