Merge branch 'MDL-62434-master' of git://github.com/bmbrands/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 15 May 2018 02:06:57 +0000 (10:06 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 15 May 2018 02:06:57 +0000 (10:06 +0800)

Trivial merge