Merge branch 'MDL-55869_m32v1' of https://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 18 Nov 2016 01:16:06 +0000 (09:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 18 Nov 2016 01:16:06 +0000 (09:16 +0800)

Trivial merge