Merge changes from the pidgin.main release-2.x.y branch into
release-2.x.y
2014-07-07, Mark Doliner