Merge branch 'MDL-62009-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 May 2018 04:15:54 +0000 (12:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 May 2018 04:15:54 +0000 (12:15 +0800)

Trivial merge