Oops ... left in debug flag
Merge branch 'master' into db-refactor
Make sure extensions work for multiple databases