Merge pidgin/main branch release-2.x.y into private/main branch release-2.x.y.
release-2.x.y
2014-05-04, Mark Doliner