Merge branch 'MDL-45088-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 01:21:53 +0000 (03:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 01:21:53 +0000 (03:21 +0200)

Trivial merge