Merge branch 'MDL-52913_master' of git://github.com/marxjohnson/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 1 Feb 2016 05:46:18 +0000 (13:46 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 1 Feb 2016 05:46:18 +0000 (13:46 +0800)

Trivial merge