Merge branch 'MDL-63131-master' of https://github.com/sammarshallou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Aug 2018 00:57:17 +0000 (08:57 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Aug 2018 00:57:17 +0000 (08:57 +0800)

Trivial merge