Merge branch 'MDL-33483_m33v2' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Feb 2017 02:40:21 +0000 (10:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Feb 2017 02:40:21 +0000 (10:40 +0800)

Trivial merge