Merge branch 'MDL-61256-master' of https://github.com/sammarshallou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Apr 2018 06:23:54 +0000 (14:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Apr 2018 06:23:54 +0000 (14:23 +0800)

Trivial merge