Merged in dequisdequis/pidgin (pull request #167)

2016-11-01, Gary Kramlich