Merge branch 'MDL-61751-master-fix' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Apr 2018 01:10:32 +0000 (09:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Apr 2018 01:10:32 +0000 (09:10 +0800)

Trivial merge