Stray '{' removed
Merge branch 'master' into dev