Merge branch 'MDL-58744-master' of https://github.com/jacac/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 06:36:18 +0000 (08:36 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 06:36:18 +0000 (08:36 +0200)

Trivial merge