Merge branch 'MDL-55480-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 Aug 2016 05:50:55 +0000 (13:50 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 Aug 2016 05:50:55 +0000 (13:50 +0800)

Trivial merge