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