Merge with release-2.x.y

2013-03-03, Daniel Atallah