Merge branch 'MDL-64307_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 4 Dec 2018 04:03:39 +0000 (12:03 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 4 Dec 2018 04:03:39 +0000 (12:03 +0800)

Trivial merge