Merge branch 'wip_MDL-53724_master' of git://github.com/gjb2048/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Sep 2016 03:34:06 +0000 (11:34 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Sep 2016 03:34:06 +0000 (11:34 +0800)

Trivial merge