Merge branch 'MDL-61240' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 22 Jan 2018 03:36:41 +0000 (11:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 22 Jan 2018 03:36:41 +0000 (11:36 +0800)

Trivial merge