Merge pull request #4109 from lucize/doveupsqlite