Merge branch 'development'
Removed redundant opening and closing braces.
Merge branch 'development'
Merge branch 'master' into development