Merge branch 'MDL-35788-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 4 Oct 2018 04:45:09 +0000 (12:45 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 4 Oct 2018 04:45:09 +0000 (12:45 +0800)

Trivial merge