grim/testing

grim/testing/
Merged in rw_grim/pidgin/release-2.x.y (pull request #180)
release-2.x.y
2017-03-10, Gary Kramlich
d2b30e2b419b