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