Merge branch 'MDL-57999_2' of https://github.com/zoebogner/moodle