Merge branch 'MDL-61928' of git://github.com/timhunt/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 18 Apr 2018 08:00:49 +0000 (16:00 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 18 Apr 2018 08:00:49 +0000 (16:00 +0800)

Trivial merge