Merge branch 'MDL-53111_m32v1' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Jun 2016 05:30:51 +0000 (13:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Jun 2016 05:30:51 +0000 (13:30 +0800)

Trivial merge