Merge branch 'MDL-57532_m33v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 10:34:58 +0000 (10:34 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 10:34:58 +0000 (10:34 +0000)

Trivial merge