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

Trivial merge