Merge branch 'MDL-25936_wip' of git://github.com/skodak/moodle