db dropped, recreated
Merge branch 'stefan'