Merge branch 'MDL-61772-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 19 Apr 2018 08:13:18 +0000 (16:13 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 19 Apr 2018 08:13:18 +0000 (16:13 +0800)

Trivial merge