Merge branch 'MDL-36713_m32v2' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Aug 2016 11:04:18 +0000 (12:04 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Aug 2016 11:04:18 +0000 (12:04 +0100)

Trivial merge