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