remove dbext from master
Merge branch 'master' into work