Merge branch 'MDL-53537_m34v4' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Aug 2017 00:46:55 +0000 (08:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Aug 2017 00:46:55 +0000 (08:46 +0800)

Trivial merge