Merge release-2.x.y

2014-05-07, Tomasz Wasilczyk