Merge branch 'MDL-52826_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jan 2016 10:38:14 +0000 (10:38 +0000)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:18 +0000 (10:15 +0800)

Trivial merge