Merge branch 'MDL-55964_master' of https://github.com/StudiUM/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 3 Oct 2016 04:40:25 +0000 (12:40 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 3 Oct 2016 04:40:25 +0000 (12:40 +0800)

Trivial merge