Merge branch 'MDL-59086_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Jun 2017 07:44:46 +0000 (08:44 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Jun 2017 07:44:46 +0000 (08:44 +0100)

Trivial merge