Merge branch 'MDL-42467_database' of https://github.com/andyjdavis/moodle