Merge branch 'MDL-60130_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Oct 2017 21:47:07 +0000 (23:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Oct 2017 21:47:07 +0000 (23:47 +0200)

Trivial merge