Update the 7.x-1.x branch

Update 7.x-1.x with master