Merge branch 'wip-MDL-61966-master' of git://github.com/abgreeve/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 23 Apr 2018 05:11:30 +0000 (13:11 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 23 Apr 2018 05:11:30 +0000 (13:11 +0800)

Trivial merge