Merge branch 'MDL-59569-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 19 Jul 2017 07:43:56 +0000 (08:43 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 19 Jul 2017 07:43:56 +0000 (08:43 +0100)

Trivial merge