Merge branch 'MDL-58174-master' of https://github.com/abias/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Jul 2017 08:05:19 +0000 (09:05 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Jul 2017 08:05:19 +0000 (09:05 +0100)

Trivial merge