Merge branch 'MDL-61574-master' of git://github.com/tallthom/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Sun, 1 Apr 2018 03:49:17 +0000 (11:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Sun, 1 Apr 2018 03:49:17 +0000 (11:49 +0800)

Trivial merge