Merge branch 'MDL-56216-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 10 Oct 2016 04:49:07 +0000 (12:49 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 10 Oct 2016 04:49:07 +0000 (12:49 +0800)

Trivial merge