Merge branch 'MDL-62544-master' of git://github.com/Dagefoerde/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 29 May 2018 08:24:59 +0000 (16:24 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 29 May 2018 08:24:59 +0000 (16:24 +0800)

Trivial merge