Merge branch 'MDL-57415_m33v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 12:24:10 +0000 (12:24 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 12:24:10 +0000 (12:24 +0000)

Trivial merge