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