Merge branch 'MDL-59096-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 23:34:21 +0000 (01:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 23:34:21 +0000 (01:34 +0200)

Trivial merge