Merge branch 'MDL-62079-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 24 Apr 2018 03:56:23 +0000 (11:56 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 24 Apr 2018 03:56:23 +0000 (11:56 +0800)

Trivial merge