Merge pull request #544 from andrerod/dev

Update SQL wrappers
Add missing file
Merge remote-tracking branch 'upstream/dev' into dev
Merge branch 'dev'