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