Merge branch 'MDL-59395_master-fix2' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Jul 2017 13:34:43 +0000 (15:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Jul 2017 13:34:43 +0000 (15:34 +0200)

Trivial merge