Merge branch 'MDL-62969_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Aug 2018 01:21:14 +0000 (09:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Aug 2018 01:21:14 +0000 (09:21 +0800)

Trivial merge