Merge branch 'MDL-59437-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 13 Jul 2017 08:16:19 +0000 (09:16 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 13 Jul 2017 08:16:19 +0000 (09:16 +0100)

Trivial merge