Merge branch 'MDL-52137-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 2 Feb 2016 02:55:59 +0000 (10:55 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 2 Feb 2016 02:55:59 +0000 (10:55 +0800)

Trivial merge