Merge branch 'MDL-53501-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 2 Nov 2017 07:30:24 +0000 (08:30 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 2 Nov 2017 07:30:24 +0000 (08:30 +0100)

Trivial merge