Merge pull request #5543 from dedeckeh/pr-sqlite