Adds some extra braces to silence Xcode 5.1 induced warnings.
Merges with origin/master