Merge branch 'wip-MDL-62289-master' of git://github.com/abgreeve/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 05:52:46 +0000 (13:52 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 05:52:46 +0000 (13:52 +0800)

Trivial merge