Merge branch 'MDL-59317' of https://github.com/NeillM/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Jul 2017 12:28:28 +0000 (13:28 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Jul 2017 12:28:28 +0000 (13:28 +0100)

Trivial merge