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

2014-02-01, Mark Doliner