Merge branch 'wip-MDL-56829-master-2' of git://github.com/marinaglancy/moodle