Merge branch 'MDL-59442-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Jul 2017 08:16:29 +0000 (09:16 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Jul 2017 08:16:29 +0000 (09:16 +0100)

Trivial merge