Fix database file numbers
more number changes
Merge remote-tracking branch 'upstream/master'
Merge pull request #1003 from Cadair/master

[BugFix]: Travis Issues round 2