Merge branch 'MDL-59629-master' of git://github.com/peterRd/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 17 Dec 2018 07:57:52 +0000 (15:57 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 17 Dec 2018 07:57:52 +0000 (15:57 +0800)

Trivial merge