Merge branch 'MDL-50286_m32v3' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 1 Aug 2016 01:54:06 +0000 (09:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 1 Aug 2016 01:54:06 +0000 (09:54 +0800)

Trivial merge