Minor: removed language constraint in database (it doesn't work)
Merge remote-tracking branch 'origin/master'