Merge branch '1.X-STABLE' into 1.X-EXPERIMENTAL