fix startup error with fresh db
Merge branch 'master' into dev
previous version was correct