Merged in fbellet/pidgin/port-changes-from-branch-2.x.y-to-default (pull request #632)

2020-02-04, Gary Kramlich