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