Merge branch 'mdl58161-master' of https://github.com/tlock/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Jun 2017 23:21:35 +0000 (01:21 +0200)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:30:41 +0000 (12:30 +0100)

Trivial merge