Merge branch 'MDL-57728_m33v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jan 2017 08:28:15 +0000 (08:28 +0000)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Feb 2017 05:01:24 +0000 (13:01 +0800)

Trivial merge