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