Merge branch 'MDL-63946-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE

This commit is contained in:
Jun Pataleta
2018-11-09 13:41:21 +08:00