Merge branch 'MDL-63477-master' of https://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 28 Sep 2018 01:47:49 +0000 (09:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 28 Sep 2018 01:47:49 +0000 (09:47 +0800)

Trivial merge