Merge branch 'MDL-32135_m32v2' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Jun 2016 09:07:43 +0000 (10:07 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Jun 2016 08:24:55 +0000 (09:24 +0100)

Trivial merge