Merge branch 'MDL-59671-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Aug 2017 03:46:51 +0000 (11:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Aug 2017 03:46:51 +0000 (11:46 +0800)

Trivial merge