Merge branch 'MDL-58826_master' of https://github.com/marxjohnson/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 23:44:18 +0000 (01:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 23:44:18 +0000 (01:44 +0200)

Trivial merge