Merge branch 'MDL-41126' of git://github.com/dg711/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 Aug 2016 05:24:25 +0000 (13:24 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 Aug 2016 05:24:25 +0000 (13:24 +0800)

Trivial merge