Merge branch 'MDL-61970-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Apr 2018 03:12:35 +0000 (11:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Apr 2018 03:12:35 +0000 (11:12 +0800)

Trivial merge