grim/testing

grim/testing/
Merged pidgin/main into default

2016-10-30, Arkadiy Illarionov
bea4cc95b40f