Merge branch 'MDL-59860-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Aug 2017 06:11:44 +0000 (14:11 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Aug 2017 06:11:44 +0000 (14:11 +0800)

Trivial merge