braces
Merge pull request #1538 from ethomson/merge_warning_cleanup

braces