Merge branch 'MDL-57636_master' of https://github.com/dasistwas/moodle