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