Merge master into 7.x-1.x