Merged pidgin/main into default

2017-05-28, Arkadiy Illarionov