Merge branch 'MDL-18839_19_wip' of git://github.com/skodak/moodle into MOODLE_19_STABLE