Merge branch 'MDL-54120' of git://github.com/aolley/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 May 2016 13:38:30 +0000 (21:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 May 2016 13:38:30 +0000 (21:38 +0800)

Trivial merge