Merge branch 'MDL-59112-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Jun 2017 12:39:09 +0000 (14:39 +0200)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:30:38 +0000 (12:30 +0100)

Trivial merge