Merge branch 'MDL-56254-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 10 Oct 2016 05:01:40 +0000 (13:01 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 10 Oct 2016 05:01:40 +0000 (13:01 +0800)

Trivial merge