Merge branch 'MDL-51505-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 02:30:22 +0000 (10:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 02:30:22 +0000 (10:30 +0800)

Trivial merge