Merge branch 'MDL-62983-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 2 Aug 2018 03:17:13 +0000 (11:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 2 Aug 2018 03:17:13 +0000 (11:17 +0800)

Trivial merge