Remove trailing comma
Merge branch 'develop'