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