Merge branch 'MDL-60503-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Nov 2017 09:41:48 +0000 (10:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Nov 2017 09:41:48 +0000 (10:41 +0100)

Trivial merge