Merge branch 'MDL-55568_m33v2' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 Dec 2016 14:33:05 +0000 (14:33 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Dec 2016 14:33:05 +0000 (14:33 +0000)

Trivial merge