This being a PR explicitly introducing master/1.x-master divergence, I think style changes should be omitted so *they* at least can be cherry-picked with minimal conflicts.