Merge branch 'MDL-66665-39-POC2' of git://github.com/peterRd/moodle into MOODLE_39_STABLE