Merge branch 'MDL-41126_master' of git://github.com/dg711/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 10 Aug 2016 04:25:45 +0000 (12:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 10 Aug 2016 04:25:45 +0000 (12:25 +0800)

Trivial merge