Merge branch 'MDL-59364_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 00:31:48 +0000 (02:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 00:31:48 +0000 (02:31 +0200)

Trivial merge