Merge branch 'MDL-55993-master' of https://github.com/albertolarah/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 4 Sep 2018 08:51:28 +0000 (10:51 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 4 Sep 2018 08:51:28 +0000 (10:51 +0200)

Trivial merge