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