Merge with release-2.x.y

2014-11-05, Daniel Atallah