Merge branch 'MDL-48773_m32v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Aug 2016 07:18:16 +0000 (08:18 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Aug 2016 07:18:16 +0000 (08:18 +0100)

Trivial merge