Merge branch 'MDL-42266_m33v2' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jan 2017 23:46:02 +0000 (07:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jan 2017 23:46:02 +0000 (07:46 +0800)

Trivial merge