Merge branch 'MDL-61394-master' of git://git.cameron1729.xyz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Feb 2018 01:43:55 +0000 (09:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 22 Feb 2018 00:30:53 +0000 (08:30 +0800)

Trivial merge