Merge branch 'MDL-61919_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 May 2018 07:45:43 +0000 (15:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 May 2018 07:45:43 +0000 (15:45 +0800)

Trivial merge