Merge branch 'MDL-59515' of https://github.com/NeillM/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Jul 2017 08:42:27 +0000 (09:42 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Jul 2017 08:42:27 +0000 (09:42 +0100)

Trivial merge