Merge branch 'MDL-61736-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Apr 2018 07:25:02 +0000 (15:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Apr 2018 07:25:02 +0000 (15:25 +0800)

Trivial merge