Merge branch 'MDL-55876-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Sep 2016 01:10:43 +0000 (09:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Sep 2016 01:10:43 +0000 (09:10 +0800)

Trivial merge