Points to branch 7.x-1.x for merge