Merge branch 'MDL-58559-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 18 Apr 2017 01:42:36 +0000 (09:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 18 Apr 2017 01:42:36 +0000 (09:42 +0800)

Trivial merge