Merge branch 'MDL-61215-39' of git://github.com/sarjona/moodle into MOODLE_39_STABLE