Merge pull request #1042 in master
CS fix to match PSR2

"The body of each structure MUST be enclosed by braces. This standardizes
how the structures look, and reduces the likelihood of introducing errors
as new lines get added to the body." -
https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md#5-control-structures
Merge pull request #1051
Merge pull request #1051 in develop