Merge branch 'MDL-58551-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 18 Apr 2017 02:23:03 +0000 (10:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 18 Apr 2017 02:23:03 +0000 (10:23 +0800)

Trivial merge