Merge branch 'MDL-63658-master-2' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 18 Oct 2018 07:48:47 +0000 (15:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 18 Oct 2018 07:48:47 +0000 (15:48 +0800)

Trivial merge