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

Trivial merge