Merge branch 'MDL-56167-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 3 Oct 2016 03:04:34 +0000 (11:04 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 3 Oct 2016 03:04:34 +0000 (11:04 +0800)

Trivial merge