Merge branch 'wip-MDL-59881-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Aug 2017 22:55:58 +0000 (00:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Aug 2017 22:55:58 +0000 (00:55 +0200)

Trivial merge