Merge branch 'MDL-62993_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Aug 2018 05:10:41 +0000 (13:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Aug 2018 05:10:41 +0000 (13:10 +0800)

Trivial merge