Merge branch 'MDL-54131_m31v3' of https://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 May 2016 04:01:37 +0000 (12:01 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 May 2016 04:01:37 +0000 (12:01 +0800)

Trivial merge