Merge branch 'MDL-65536-master' of https://github.com/snake/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 14 May 2019 03:32:02 +0000 (11:32 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 14 May 2019 03:32:02 +0000 (11:32 +0800)

Trivial merge