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