Merge branch 'MDL-49558-28-master-table-fix' of https://github.com/dmonllao/moodle