Merge branch 'MDL-53495' of https://github.com/mr-russ/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Jul 2016 07:07:21 +0000 (15:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Jul 2016 07:07:21 +0000 (15:07 +0800)

Trivial merge