Merge from release-2.x.y branch. No manual merges.

2014-04-12, Mark Doliner