Merge branch 'MDL-63012-master' of https://github.com/jobyh/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Aug 2018 01:32:55 +0000 (09:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Aug 2018 01:32:55 +0000 (09:32 +0800)

Trivial merge