Merge branch 'MDL-59392-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Sep 2017 13:39:43 +0000 (14:39 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Sep 2017 13:39:43 +0000 (14:39 +0100)

Trivial merge