Merge branch 'MDL-60363-master' of https://github.com/Kathrin84/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Dec 2017 23:41:39 +0000 (00:41 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 27 Dec 2017 16:54:59 +0000 (17:54 +0100)

Trivial merge