Merge branch 'MDL-47363' of git://github.com/marinaglancy/moodle