Merge branch 'MDL-53938' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 31 May 2016 03:42:17 +0000 (11:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 31 May 2016 03:42:17 +0000 (11:42 +0800)

Trivial merge