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