in-passing typo fix
Merge remote-tracking branch: upstream/master