Merge branch 'MDL-53409-master' of git://github.com/crazyserver/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 22 Mar 2016 00:01:16 +0000 (08:01 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 22 Mar 2016 00:01:16 +0000 (08:01 +0800)

Trivial merge