Merge branch 'wip-MDL-62351-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 May 2018 13:11:06 +0000 (21:11 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:17:28 +0000 (09:17 +0800)

Trivial merge