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