Merge branch 'master' of http://git.kpe.io/clsql