Merge branch 'MDL-55715_m33v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 Dec 2016 08:35:42 +0000 (08:35 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Dec 2016 08:35:42 +0000 (08:35 +0000)

Trivial merge