Remove superfluous indentation from one line of code

This line is indented by one too many levels. It's been indented relative to the
part of the if statement that's been broken onto a second line, rather than
relative to the previous indentation level itself. This makes it look like two
nested if statements instead of the one that's actually there.
Merge branch 'hotfix/4279'

Close #4279
Merge pull request #4263 from h2s/indentationfix

Remove superfluous indentation from one line of code
[#4263] Better formatting still

- CS indicates && and || should be on next line; multiline conditionals
  should put the closing paren and brace on a line of their own.
Merge branch 'hotfix/4263' into develop

Forward port #4263