Merge branch 'MDL-60061-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Dec 2017 06:03:47 +0000 (14:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Dec 2017 06:03:47 +0000 (14:03 +0800)

Trivial merge