Switched to a simplified form of SQL.
Merge remote-tracking branch 'origin/master'