Merge master back into 1.7.x