Manual merge release-2.x.y branch into master.

2014-09-30, Mark Doliner