Merge branch 'MDL-55254_m32v3' of https://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 25 Jul 2016 20:27:48 +0000 (04:27 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 25 Jul 2016 20:27:48 +0000 (04:27 +0800)

Trivial merge