Merge branch 'wip-master-MDL-62345' of https://github.com/adpe/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 27 Feb 2019 05:51:08 +0000 (13:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 27 Feb 2019 05:51:08 +0000 (13:51 +0800)

Trivial merge