Merged in rw_grim/pidgin (pull request #311)

2018-02-16, Gary Kramlich