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