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

Trivial merge