fixs for SQL::Abstract (oxe)
Merge branch 'master' into production