Merge branch 'MDL-59080_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Jun 2017 11:49:03 +0000 (12:49 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Jun 2017 11:49:03 +0000 (12:49 +0100)

Trivial merge