Merge branch 'MDL-52131-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Sep 2017 23:53:07 +0000 (01:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Sep 2017 23:53:07 +0000 (01:53 +0200)

Trivial merge