Merge branch 'MDL-59515' of https://github.com/NeillM/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 19 Jul 2017 12:11:23 +0000 (13:11 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 19 Jul 2017 12:11:23 +0000 (13:11 +0100)

Trivial merge