Merge branch 'MDL-59169-master' of https://github.com/nwp90/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Aug 2018 01:43:30 +0000 (09:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Aug 2018 01:43:30 +0000 (09:43 +0800)

Trivial merge