Merge branch 'MDL-25754_20_wip' of git://github.com/skodak/moodle