Merge branch 'MDL-48944_m32v4' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 14:56:00 +0000 (15:56 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 14:56:00 +0000 (15:56 +0100)

Trivial merge