Merge branch 'MDL-54940-master' of https://github.com/LukeCarrier/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 03:53:05 +0000 (11:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 03:53:05 +0000 (11:53 +0800)

Trivial merge