Use braces around one-liner.
Merge pull request #6019 from franzliedke/patch-6

[5.0] Use Braces Around One-Liner