Merged in CMaiku/pidgin (pull request #162)

2016-10-25, Gary Kramlich