Merge branch 'MDL-55883_m32v1' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 Nov 2016 03:06:11 +0000 (11:06 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 Nov 2016 03:06:11 +0000 (11:06 +0800)

Trivial merge