Merge branch 'MDL-54622_m32v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jun 2016 15:38:19 +0000 (16:38 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:09 +0000 (09:04 +0100)

Trivial merge