Merge branch 'MDL-61519-master' of https://github.com/MartinGauk/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 21 Mar 2018 00:14:41 +0000 (08:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 21 Mar 2018 00:14:41 +0000 (08:14 +0800)

Trivial merge