Merge branch 'MDL-62240-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 May 2018 10:57:28 +0000 (18:57 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 May 2018 10:57:28 +0000 (18:57 +0800)

Trivial merge