Merge branch 'MDL-53509-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 00:42:58 +0000 (08:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 00:42:58 +0000 (08:42 +0800)

Trivial merge