Merge "fix minor whitespace nit"