Merge branch 'MDL-68446' of https://github.com/timhunt/moodle

diff --cc question/type/ddimageortext/amd/build/form.min.js
index 5a60adc,b57875a..1753414
Binary files differ

diff --cc question/type/ddimageortext/amd/build/form.min.js.map
index d8856e2,03c166a..1e6304f
Binary files differ

diff --cc question/type/ddimageortext/amd/src/form.js
Simple merge

diff --cc question/type/ddmarker/amd/build/form.min.js
index 2607883,1f8d59d..edf1402
Binary files differ

diff --cc question/type/ddmarker/amd/build/form.min.js.map
index 3fc5453,99e3d35..a8ed51d
Binary files differ

diff --cc question/type/ddmarker/amd/src/form.js
Simple merge