Merge branch 'MDL-58907_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Jun 2017 23:02:35 +0000 (01:02 +0200)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:30:40 +0000 (12:30 +0100)

Trivial merge