Merge branch 'MDL-51117-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 05:26:37 +0000 (13:26 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 05:26:37 +0000 (13:26 +0800)

Trivial merge