Merge branch 'MDL-62214-master-fixup' of https://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 May 2018 05:09:12 +0000 (13:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 May 2018 05:09:12 +0000 (13:09 +0800)

Trivial merge