Remove errant comma in SQL schema
Merge remote-tracking branch 'origin/master'