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

Trivial merge