Merge branch 'MDL-59572-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Jul 2017 08:54:39 +0000 (09:54 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Jul 2017 08:54:39 +0000 (09:54 +0100)

Trivial merge