Merge branch 'MDL-55355-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Aug 2016 02:29:30 +0000 (10:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Aug 2016 02:29:30 +0000 (10:29 +0800)

Trivial merge