Merge branch 'master' of http://git.b9.com/clsql