Merge branch 'MDL-52597-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 02:01:07 +0000 (10:01 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 02:01:07 +0000 (10:01 +0800)

Trivial merge