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