Merge branch 'MDL-55464_m32v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 13:20:31 +0000 (14:20 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 13:20:31 +0000 (14:20 +0100)

Trivial merge