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