Merge branch '2.x-stable'