Merge branch 'MDL-55993-master' of https://github.com/albertolarah/moodle into MDL...
authorAlberto Lara Hernández <alberto.lara@moodle.com>
Mon, 3 Sep 2018 10:18:58 +0000 (12:18 +0200)
committerAlberto Lara Hernández <alberto.lara@moodle.com>
Mon, 3 Sep 2018 10:18:58 +0000 (12:18 +0200)

Trivial merge