Merge branch 'MDL-64376-master-2' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 28 Feb 2019 03:45:27 +0000 (11:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 28 Feb 2019 03:45:27 +0000 (11:45 +0800)

Trivial merge