works with BBDB3
Merge branch 'master' into bbdb3