Merge branch 'MDL-61945-master' of git://github.com/cescobedo/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Apr 2018 03:50:31 +0000 (11:50 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Apr 2018 03:50:31 +0000 (11:50 +0800)

Trivial merge