Merge branch 'MDL-54968-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 02:21:06 +0000 (10:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 02:21:06 +0000 (10:21 +0800)

Trivial merge