Merge branch 'MDL-62213-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Apr 2018 05:03:13 +0000 (13:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Apr 2018 05:03:13 +0000 (13:03 +0800)

Trivial merge