Fix indent in parenthesized expression in indenting statement (PY-11868).
Merge remote-tracking branch 'origin/master'
Insert two spaces before line comment (PY-11901).
Merge remote-tracking branch 'origin/master'