Merge branch 'wip-MDL-25290-m24-compact' of git://github.com/samhemelryk/moodle