Merge branch 'mdl55979-master' of https://github.com/tlock/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Jul 2017 04:29:00 +0000 (12:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Jul 2017 04:29:00 +0000 (12:29 +0800)

Trivial merge