Merge with no conflicts.
release-2.x.y
2014-01-13, Mark Doliner