Updated database to 25 September version
Merge branch 'master' into develop