Merge branch 'MDL-60826-master-fix' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Jul 2018 05:40:25 +0000 (13:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Jul 2018 05:40:25 +0000 (13:40 +0800)

Trivial merge