Merge branch 'MDL-58820-master' of https://github.com/nwp90/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Jun 2017 09:08:25 +0000 (11:08 +0200)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:32:03 +0000 (12:32 +0100)

Trivial merge