Merge branch 'MDL-61952-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Apr 2018 02:50:50 +0000 (10:50 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Apr 2018 02:50:50 +0000 (10:50 +0800)

Trivial merge