Merge branch 'MDL-62488_master' of https://github.com/marxjohnson/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 May 2018 01:29:47 +0000 (09:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 May 2018 01:29:47 +0000 (09:29 +0800)

Trivial merge