Merge branch 'MDL-60378-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 12:06:26 +0000 (14:06 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 12:06:26 +0000 (14:06 +0200)

Trivial merge