Remove trailing comma
Merge branch 'development'