Merge branch 'MDL-57035-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Nov 2016 04:02:45 +0000 (12:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Nov 2016 04:02:45 +0000 (12:02 +0800)

Trivial merge