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