Manual merge of master into xovis branch

Actually, the bash script uses the existing db if it already exists. I prefer not to delete the db to preserve the existing data.