Merge branch 'MDL-61365-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Mar 2018 05:44:17 +0000 (13:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Mar 2018 05:44:17 +0000 (13:44 +0800)

Trivial merge