Merge branch 'wip-MDL-61939-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 23 Apr 2018 09:19:49 +0000 (17:19 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 23 Apr 2018 09:19:49 +0000 (17:19 +0800)

Trivial merge