Merge branch 'MDL-60514-master-fix' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 26 Oct 2018 03:06:44 +0000 (11:06 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 26 Oct 2018 03:06:44 +0000 (11:06 +0800)

Trivial merge