Merge release-2.x.y branch into master.

2014-11-04, Mark Doliner