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