Merge branch 'MDL-63977-beforemerge' of https://github.com/sammarshallou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Feb 2019 05:21:15 +0000 (13:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Feb 2019 05:21:15 +0000 (13:21 +0800)

Trivial merge