Merge branch 'MDL-47494-ddmarker' into MDL-47494
[moodle.git] / mod / index.html