Merge branch 'MDL-62219-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Apr 2018 02:34:09 +0000 (10:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Apr 2018 02:34:09 +0000 (10:34 +0800)

Trivial merge