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

Trivial merge