7.x-1.2
d3636a3e · Merge branch '7.x-1.x' into 7.x-1.x-dev ·