Fix SQL syntax.
Merge branch 'master' into turba_4_2