Merge branch 'MDL-54578_m31v2' of https://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 19 May 2016 03:41:21 +0000 (11:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 May 2016 03:41:21 +0000 (11:41 +0800)

Trivial merge